Modify the message expose in para-install stage

Now, void doesn't show
This commit is contained in:
Suikan 2021-07-01 15:36:52 +09:00
parent 782cfedb67
commit 3a5446c6ad
3 changed files with 6 additions and 4 deletions

View file

@ -26,7 +26,7 @@ sleep 1 # 1sec.
# Make target GRUB aware to the crypt partition # 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. # This must do it after start of the file copy by installer, but before the end of the file copy.
# If the environment is not GUI, keep quiet not to bother the TUI installer. # If the environment is not GUI, keep quiet not to bother the TUI installer.
if [ $GUIENV -eq 1 ]; then if [ $PARINSTMSG -eq 1 ]; then
echo "...Add GRUB_ENABLE_CRYPTODISK entry to ${TARGETMOUNTPOINT}/etc/default/grub " echo "...Add GRUB_ENABLE_CRYPTODISK entry to ${TARGETMOUNTPOINT}/etc/default/grub "
fi fi
echo "GRUB_ENABLE_CRYPTODISK=y" >> ${TARGETMOUNTPOINT}/etc/default/grub echo "GRUB_ENABLE_CRYPTODISK=y" >> ${TARGETMOUNTPOINT}/etc/default/grub
@ -34,7 +34,7 @@ echo "GRUB_ENABLE_CRYPTODISK=y" >> ${TARGETMOUNTPOINT}/etc/default/grub
# And then, wait for the end of installer process # And then, wait for the end of installer process
# If the environment is not GUI, keep quiet not to bother the TUI installer. # If the environment is not GUI, keep quiet not to bother the TUI installer.
if [ $GUIENV -eq 1 ]; then if [ $PARAINSTMSG -eq 1 ]; then
echo "...Waiting for the end of GUI/TUI installer." echo "...Waiting for the end of GUI/TUI installer."
fi fi
wait $installer_pid wait $installer_pid

View file

@ -17,8 +17,9 @@ HEREDOC
fi # "sourced" validation fi # "sourced" validation
# This is the mount point of the install target. # This is the mount point of the install target.
# Refered in the para-install stage
export TARGETMOUNTPOINT="/target" export TARGETMOUNTPOINT="/target"
# 1 : Show message during GUI/TUI installer, 0 : Do not show.
export PARAINSTMSG=1
# Distribution check # Distribution check
if ! uname -a | grep ubuntu -i > /dev/null ; then # "Ubuntu" is not found in the OS name. if ! uname -a | grep ubuntu -i > /dev/null ; then # "Ubuntu" is not found in the OS name.

View file

@ -17,8 +17,9 @@ HEREDOC
fi # "sourced" validation fi # "sourced" validation
# This is the mount point of the install target. # This is the mount point of the install target.
# Refered in the para-install stage
export TARGETMOUNTPOINT="/mnt/target" export TARGETMOUNTPOINT="/mnt/target"
# 1 : Show message during GUI/TUI installer, 0 : Do not show.
export PARAINSTMSG=0
# Distribution check # Distribution check
if ! uname -a | grep void -i > /dev/null ; then # "Void" is not found in the OS name. if ! uname -a | grep void -i > /dev/null ; then # "Void" is not found in the OS name.