Add "[Kaiten-Yaki]" to the message header

This commit is contained in:
Suikan 2022-05-11 07:16:08 +09:00
parent 555bf5a38e
commit 73b3329cd7
6 changed files with 106 additions and 106 deletions

View file

@ -45,17 +45,17 @@ function main() {
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?
# Yes
echo ".../etc/default/grub already modified. OK, skipping to modiy."
echo "[Kaiten-Yaki] /etc/default/grub already modified. OK, skipping to modiy."
else
# Not yet. Let's add.
echo "...Modify /etc/default/grub."
echo "[Kaiten-Yaki] Modify /etc/default/grub."
sed -i -e "/GRUB_CMDLINE_LINUX_DEFAULT/{s#\"# ${GRUB_ADDITIONAL_PARAMETERS}\"#2}" /etc/default/grub
fi
# Common part of the pre-install stage
if ! pre_install ; then
# If error, restore the modification.
echo "...restoring /etc/default/grub, if needed"
echo "[Kaiten-Yaki] restoring /etc/default/grub, if needed"
sed -i -e "s#${GRUB_ADDITIONAL_PARAMETERS}##" /etc/default/grub
return 1 # with error status
fi
@ -96,13 +96,13 @@ function para_install_local() {
# Distrobution dependent message
cat <<- HEREDOC
************************ CAUTION! CAUTION! CAUTION! ****************************
Make sure to click "NO", if the void-installer ask you to reboot.
Just exit the installer without rebooting. Other wise, your system
is unable to boot.
Type return key to start void-installer.
******************** CAUTION! CAUTION! CAUTION! ************************
[Kaiten-Yaki]
[Kaiten-Yaki] Make sure to click "NO", if the void-installer ask you to
[Kaiten-Yaki] reboot.Just exit the installer without rebooting. Otherwise,
[Kaiten-Yaki] your system becomes unable to boot.
[Kaiten-Yaki]
[Kaiten-Yaki] Type return key to start void-installer.
HEREDOC
# waiting for a console input
@ -123,7 +123,7 @@ function para_install_local() {
# If exist, the grub was not modifyed -> void-installer termianted unexpectedly
# Delete the nwe volume if overwrite install, and close all
on_unexpected_installer_quit
echo "...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
return 1 # with error status
fi
@ -149,7 +149,7 @@ function grub_check_and_modify_local() {
# Make target GRUB aware to the crypt partition
# This must do it after start of the file copy by installer, but before the end of the file copy.
echo "...Adding GRUB_ENABLE_CRYPTODISK entry to ${TARGETMOUNTPOINT}/etc/default/grub "
echo "[Kaiten-Yaki] Adding GRUB_ENABLE_CRYPTODISK entry to ${TARGETMOUNTPOINT}/etc/default/grub "
echo "GRUB_ENABLE_CRYPTODISK=y" >> ${TARGETMOUNTPOINT}/etc/default/grub
# succesfull return