Preservation/kaiten-yaki
1
0
Fork 0
mirror of https://github.com/suikan4github/kaiten-yaki.git synced 2025-12-20 02:21:17 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update void-kaiten-yaki.sh

Browse source 
Typo fix
This commit is contained in:
tromcho 2023-02-21 13:32:30 +07:00 • committed by GitHub
parent 809dafa70c
commit 661ad2808e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
script/void-kaiten-yaki.sh
View file

@ -20,7 +20,7 @@ function main() {
export DISTRIBUTIONSIGNATURE="void" export DISTRIBUTIONSIGNATURE="void"
export DISTRIBUTIONNAME="Void Linux" export DISTRIBUTIONNAME="Void Linux"
# Check whetehr given signature exist or not # Check whether given signature exist or not
if ! distribution_check ; then if ! distribution_check ; then
return 1 # with error status return 1 # with error status
fi fi
@ -41,7 +41,7 @@ function main() {
# This is magical part. I have not understood why this is required. # This is magical part. I have not understood why this is required.
# Anyway, without this modification, Void Linux doesn't boot. # Anyway, without this modification, Void Linux doesn't boot.
# Refer https://wiki.voidlinux.org/Install_LVM_LUKS#Installation_using_void-installer # Refer https://wiki.voidlinux.org/Install_LVM_LUKS#Installation_using_void-installer
# This modification is guaratnteed once only. To allow re-trying the installation after unexpected GUI/TUI installer quit. # This modification is guaranteed once only. To allow re-trying the installation after unexpected GUI/TUI installer quit.
export GRUB_ADDITIONAL_PARAMETERS="rd.auto=1 cryptdevice=${DEV}${CRYPTPARTITION}:${CRYPTPARTNAME} root=/dev/mapper/${VGNAME}-${LVROOTNAME}" export GRUB_ADDITIONAL_PARAMETERS="rd.auto=1 cryptdevice=${DEV}${CRYPTPARTITION}:${CRYPTPARTNAME} root=/dev/mapper/${VGNAME}-${LVROOTNAME}"
if grep "$GRUB_ADDITIONAL_PARAMETERS" /etc/default/grub ; then # Is additonal parameter already added? if grep "$GRUB_ADDITIONAL_PARAMETERS" /etc/default/grub ; then # Is additonal parameter already added?
# Yes # Yes
@ -108,7 +108,7 @@ function para_install_local() {
# waiting for a console input # waiting for a console input
read -r read -r
# Start the background target/etc/default/grub cheker. # Start the background target/etc/default/grub checker.
# The definition of this function is down below. # The definition of this function is down below.
grub_check_and_modify_local & grub_check_and_modify_local &
@ -120,8 +120,8 @@ function para_install_local() {
# Check if background checker still exist # Check if background checker still exist
if ps $grub_check_and_modify_id > /dev/null ; then # If exists if ps $grub_check_and_modify_id > /dev/null ; then # If exists
# If exist, the grub was not modifyed -> void-installer termianted unexpectedly # If exist, the grub was not modifyed -> void-installer terminated unexpectedly
# Delete the nwe volume if overwrite install, and close all # Delete the new volume if overwrite install, and close all
on_unexpected_installer_quit on_unexpected_installer_quit
echo "[Kaiten-Yaki] restoring modified /etc/default/grub." echo "[Kaiten-Yaki] restoring modified /etc/default/grub."
sed -i "s#loglevel=4 ${GRUB_ADDITIONAL_PARAMETERS}#loglevel=4#" /etc/default/grub sed -i "s#loglevel=4 ${GRUB_ADDITIONAL_PARAMETERS}#loglevel=4#" /etc/default/grub
@ -144,7 +144,7 @@ function grub_check_and_modify_local() {
sleep 1 # 1sec. sleep 1 # 1sec.
done # while done # while
# Perhaps, too neuvous. Wait 1 more sectond to avoid the rece condition. # Perhaps, too nervous. Wait 1 more second to avoid the rece condition.
sleep 1 # 1sec. sleep 1 # 1sec.
# Make target GRUB aware to the crypt partition # Make target GRUB aware to the crypt partition
@ -159,4 +159,4 @@ function grub_check_and_modify_local() {
# ******************************************************************************* # *******************************************************************************
# Execute # Execute
main main