fix the bug of the parainstall position

This commit is contained in:
Suikan 2021-07-01 21:11:16 +09:00
parent d51c88949b
commit 88270a7fed
6 changed files with 14 additions and 14 deletions

View file

@ -1,4 +1,4 @@
#!/bin/bash #!/bin/bash -u
# ******************************************************************************* # *******************************************************************************
# Confirmation and Passphrase setting # Confirmation and Passphrase setting
# ******************************************************************************* # *******************************************************************************

View file

@ -1,4 +1,4 @@
#!/bin/bash #!/bin/bash -u
# ******************************************************************************* # *******************************************************************************
# Common part of para-install # Common part of para-install
# ******************************************************************************* # *******************************************************************************

View file

@ -1,4 +1,4 @@
#!/bin/bash #!/bin/bash -u
function parainstall_msg() { function parainstall_msg() {

View file

@ -1,3 +1,4 @@
#!/bin/bash -u
# ******************************************************************************* # *******************************************************************************
# Pre-install stage # Pre-install stage
# ******************************************************************************* # *******************************************************************************

View file

@ -1,4 +1,4 @@
#!/bin/bash #!/bin/bash -u
# Load configuration parameter # Load configuration parameter
source config.sh source config.sh
@ -71,9 +71,7 @@ fi
# ******************************************************************************* # *******************************************************************************
# Show common message to let the operator focus on the critical part # Show common message to let the operator focus on the critical part
if ! parainstall ; then parainstall_msg
return 1
fi
# Ubuntu dependent message # Ubuntu dependent message
cat <<HEREDOC cat <<HEREDOC
@ -98,7 +96,9 @@ installer_pid=$!
# Common part of the para-install. # Common part of the para-install.
# 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.
parainstall_msg if ! parainstall ; then
return 1
fi
# ******************************************************************************* # *******************************************************************************
# Post-install stage # Post-install stage

View file

@ -1,4 +1,4 @@
#!/bin/bash #!/bin/bash -u
# Load configuration parameter # Load configuration parameter
source config.sh source config.sh
@ -85,10 +85,7 @@ sed -i "s#loglevel=4#loglevel=4 rd.auto=1 cryptdevice=/dev/sda2:${LUKS_NAME} roo
# ******************************************************************************* # *******************************************************************************
# Show common message to let the operator focus on the critical part # Show common message to let the operator focus on the critical part
if ! parainstall ; then parainstall_msg
return 1
fi
# Ubuntu dependent message # Ubuntu dependent message
cat <<HEREDOC cat <<HEREDOC
@ -116,7 +113,9 @@ installer_pid=$!
# Common part of the para-install. # Common part of the para-install.
# 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.
source common/_parainstall.sh if ! parainstall ; then
return 1
fi
# ******************************************************************************* # *******************************************************************************
# Post-install stage # Post-install stage