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

Make warning message stronger.

Browse source 
Add comment to the error return
This commit is contained in:
Suikan 2021-07-02 07:49:22 +09:00
parent ce949a547a
commit 4f54f0bdbd
5 changed files with 21 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

12
script/common/confirmation.sh
View file

@ -14,7 +14,7 @@ function confirmation(){
Installation terminated. Installation terminated.
HEREDOC HEREDOC
return 1 return 1 # with error status
fi # "-" is found in the volume group name. fi # "-" is found in the volume group name.
# Sanity check for root volume name # Sanity check for root volume name
@ -26,7 +26,7 @@ function confirmation(){
Installation terminated. Installation terminated.
HEREDOC HEREDOC
return 1 return 1 # with error status
fi # "-" is found in the volume name. fi # "-" is found in the volume name.
# Sanity check for swap volume name # Sanity check for swap volume name
@ -38,7 +38,7 @@ function confirmation(){
Installation terminated. Installation terminated.
HEREDOC HEREDOC
return 1 return 1 # with error status
fi # "-" is found in the volume name. fi # "-" is found in the volume name.
# For surre ask the config.sh is edited # For surre ask the config.sh is edited
@ -54,7 +54,7 @@ function confirmation(){
Installation terminated. Installation terminated.
HEREDOC HEREDOC
return 1 return 1 # with error status
fi # if YES fi # if YES
# For sure ask ready to erase. # For sure ask ready to erase.
@ -67,7 +67,7 @@ function confirmation(){
Installation terminated. Installation terminated.
HEREDOC HEREDOC
return 1 return 1 # with error status
fi # if YES fi # if YES
fi # if erase all fi # if erase all
@ -87,7 +87,7 @@ function confirmation(){
Installation terminated. Installation terminated.
HEREDOC HEREDOC
return 1 return 1 # with error status
fi # passphrase validation fi # passphrase validation
# succesfull return # succesfull return

3
script/common/parainstall.sh
View file

@ -18,7 +18,7 @@ function parainstall() {
Installation process terminated. Installation process terminated.
HEREDOC HEREDOC
return 1 return 1 # with error status
fi fi
done # while done # while
@ -32,6 +32,7 @@ function parainstall() {
# And then, wait for the end of installer process # And then, wait for the end of installer process
echo "...Waiting for the end of GUI/TUI installer." echo "...Waiting for the end of GUI/TUI installer."
echo "...Again, DO NOT reboot here. Just exit the GUI/TUI installer."
wait $INSTALLER_PID wait $INSTALLER_PID
# succesfull return # succesfull return

4
script/common/preinstall.sh
View file

@ -54,7 +54,7 @@ function pre_install() {
Installation terminated. Installation terminated.
HEREDOC HEREDOC
return 1 return 1 # with error status
fi # if crypt volume is unable to open fi # if crypt volume is unable to open
# ----- Configure the LVM in LUKS volume ----- # ----- Configure the LVM in LUKS volume -----
@ -84,7 +84,7 @@ function pre_install() {
Installation terminated. Installation terminated.
HEREDOC HEREDOC
return 1 return 1 # with error status
else else
echo "...Create logical volume \"${LVROOTNAME}\" on \"${VGNAME}\"." echo "...Create logical volume \"${LVROOTNAME}\" on \"${VGNAME}\"."
lvcreate -l ${LVROOTSIZE} -n ${LVROOTNAME} ${VGNAME} lvcreate -l ${LVROOTSIZE} -n ${LVROOTNAME} ${VGNAME}

11
script/ubuntu-kaiten-yaki.sh
View file

@ -29,7 +29,7 @@ function main() {
Installation terminated. Installation terminated.
HEREDOC HEREDOC
return 1 return 1 # with error status
fi # if YES fi # if YES
fi # "Ubuntu" is not found in the OS name. fi # "Ubuntu" is not found in the OS name.
@ -40,7 +40,7 @@ function main() {
# Common part of the parameter confirmation # Common part of the parameter confirmation
if ! confirmation ; then if ! confirmation ; then
return 1 return 1 # with error status
fi fi
# ******************************************************************************* # *******************************************************************************
@ -49,7 +49,7 @@ function main() {
# Common part of the pre-install stage # Common part of the pre-install stage
if ! pre_install ; then if ! pre_install ; then
return 1 return 1 # with error status
fi fi
@ -66,7 +66,8 @@ function main() {
************************ CAUTION! CAUTION! CAUTION! **************************** ************************ CAUTION! CAUTION! CAUTION! ****************************
Make sure to click "Continue Testing", at the end of the Ubiquity installer. Make sure to click "Continue Testing", at the end of the Ubiquity installer.
Just exit the installer without rebooting. Just exit the installer without rebooting. Other wise, your system
is unable to boot.
Type return key to start Ubiquity. Type return key to start Ubiquity.
HEREDOC HEREDOC
@ -84,7 +85,7 @@ function main() {
# Record the install PID, modify the /etc/default/grub of the target, # Record the install PID, modify the /etc/default/grub of the target,
# and then, wait for the end of sintaller. # and then, wait for the end of sintaller.
if ! parainstall ; then if ! parainstall ; then
return 1 return 1 # with error status
fi fi
# ******************************************************************************* # *******************************************************************************

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

@ -40,7 +40,7 @@ function main() {
# Common part of the parameter confirmation # Common part of the parameter confirmation
if ! confirmation ; then if ! confirmation ; then
return 1 return 1 # with error status
fi fi
# ******************************************************************************* # *******************************************************************************
@ -52,7 +52,7 @@ function main() {
# Common part of the pre-install stage # Common part of the pre-install stage
if ! pre_install ; then if ! pre_install ; then
return 1 return 1 # with error status
fi fi
# ADD "rd.auto=1 cryptdevice=/dev/sda2:${CRYPTPARTNAME} root=/dev/mapper/${VGNAME}-${ROOTNAME}" to GRUB. # ADD "rd.auto=1 cryptdevice=/dev/sda2:${CRYPTPARTNAME} root=/dev/mapper/${VGNAME}-${ROOTNAME}" to GRUB.
@ -74,7 +74,8 @@ function main() {
************************ CAUTION! CAUTION! CAUTION! **************************** ************************ CAUTION! CAUTION! CAUTION! ****************************
Make sure to click "NO", if the void-installer ask you to reboot. Make sure to click "NO", if the void-installer ask you to reboot.
Just exit the installer without rebooting. Just exit the installer without rebooting. Other wise, your system
is unable to boot.
Type return key to start void-installer. Type return key to start void-installer.
HEREDOC HEREDOC
@ -92,7 +93,7 @@ function main() {
# Record the install PID, modify the /etc/default/grub of the target, # Record the install PID, modify the /etc/default/grub of the target,
# and then, wait for the end of sintaller. # and then, wait for the end of sintaller.
if ! parainstall ; then if ! parainstall ; then
return 1 return 1 # with error status
fi fi
# ******************************************************************************* # *******************************************************************************