mirror of
https://github.com/suikan4github/kaiten-yaki.git
synced 2025-12-20 18:41:17 -03:00
Add restroration of /etac/default/tab
This commit is contained in:
parent
062253981d
commit
9d3e1d137c
1 changed files with 7 additions and 3 deletions
|
|
@ -43,19 +43,21 @@ function main() {
|
||||||
# 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 guaratnteed once only. To allow re-trying the installation after unexpected GUI/TUI installer quit.
|
||||||
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
|
||||||
echo ".../etc/default/grub already modified. OK, skipping to modiy."
|
echo ".../etc/default/grub already modified. OK, skipping to modiy."
|
||||||
else
|
else
|
||||||
# Not yet. Let's add.
|
# Not yet. Let's add.
|
||||||
echo "...Modify /etc/default/grub."
|
echo "...Modify /etc/default/grub."
|
||||||
sed -i "s#loglevel=4#loglevel=4 ${grub_additional_parameters}#" /etc/default/grub
|
sed -i "s#loglevel=4#loglevel=4 ${GRUB_ADDITIONAL_PARAMETERS}#" /etc/default/grub
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Common part of the pre-install stage
|
# Common part of the pre-install stage
|
||||||
if ! pre_install ; then
|
if ! pre_install ; then
|
||||||
|
echo "...restoring modified /etc/default/grub."
|
||||||
|
sed -i "s#loglevel=4 ${GRUB_ADDITIONAL_PARAMETERS}#loglevel=4#" /etc/default/grub
|
||||||
return 1 # with error status
|
return 1 # with error status
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
@ -118,6 +120,8 @@ function para_install_local() {
|
||||||
# If exist, the grub was not modifyed -> void-installer termianted unexpectedly
|
# If exist, the grub was not modifyed -> void-installer termianted unexpectedly
|
||||||
# Delete the nwe volume if overwrite install, and close all
|
# Delete the nwe volume if overwrite install, and close all
|
||||||
on_unexpected_installer_quit
|
on_unexpected_installer_quit
|
||||||
|
echo "...restoring modified /etc/default/grub."
|
||||||
|
sed -i "s#loglevel=4 ${GRUB_ADDITIONAL_PARAMETERS}#loglevel=4#" /etc/default/grub
|
||||||
return 1 # with error status
|
return 1 # with error status
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue