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

Changed to support system void without GUI

Browse source 
Issue #1
Support non-GUI install for Void Linux.
This commit is contained in:
Suikan 2021-07-02 22:28:10 +09:00
parent f980cf3d89
commit c5ccd06c3b
1 changed files with 53 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -7,7 +7,7 @@ function main() {
# Load functions # Load functions
source lib/confirmation.sh source lib/confirmation.sh
source lib/preinstall.sh source lib/preinstall.sh
source lib/parainstall.sh # source lib/parainstall.sh # we have customized parainstall
source lib/parainstall_msg.sh source lib/parainstall_msg.sh
@ -83,19 +83,38 @@ function main() {
# waitfor a console input # waitfor a console input
read dummy_var read dummy_var
# Start void-installer in the separate window # Start the background target/etc/default/grub cheker.
xterm -fa monospace -fs ${XTERMFONTSIZE} -e void-installer & # The definition of this function is down below.
grub_check_and_modify &
# Record the PID of the installer.
export INSTALLER_PID=$!
# Common part of the para-install. # Record the PID of the background checker.
# Record the install PID, modify the /etc/default/grub of the target, grub_check_and_modify_id = $!
# and then, wait for the end of sintaller.
if ! parainstall ; then # Start void-installer
void-installer
# Check if background checker still exist
if ps $grub_check_and_modify_id > /dev/null ; then # If exists
# If exist, the grub was not modifyed -> void-installer termianted unexpectedly
cat <<-HEREDOC 1>&2
***** ERROR : The GUI/TUI installer terminated unexpectedly. *****
...Deleting the new logical volume "${VGNAME}-${LVROOTNAME}".
HEREDOC
lvremove -f /dev/mapper/${VGNAME}-${LVROOTNAME}
echo "...Deactivating all logical volumes in volume group \"${VGNAME}\"."
vgchange -a n ${VGNAME}
echo "...Closing LUKS volume \"${CRYPTPARTNAME}\"."
cryptsetup close ${CRYPTPARTNAME}
cat <<-HEREDOC 1>&2
...The new logical volume has been deleted. You can retry Kaiten-yaki again.
...Installation process terminated.
HEREDOC
return 1 # with error status return 1 # with error status
fi fi
# At here, the installation was successful.
# ******************************************************************************* # *******************************************************************************
# Post-install stage # Post-install stage
# ******************************************************************************* # *******************************************************************************
@ -164,5 +183,29 @@ function main() {
return 0 return 0
} }
# This function will be executed in the background context, to watch the TUI installer.
function grub_check_and_modify() {
# While the /etc/default/grub in the install target is NOT existing, keep sleeping.
# If installer terminated without file copy, this script also terminates.
while [ ! -e ${TARGETMOUNTPOINT}/etc/default/grub ]
do
sleep 1 # 1sec.
done # while
# Perhaps, too neuvous. Wait 1 more sectond to avoid the rece condition.
sleep 1 # 1sec.
# 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 "GRUB_ENABLE_CRYPTODISK=y" >> ${TARGETMOUNTPOINT}/etc/default/grub
# succesfull return
return 0
} # para install
# Execute # Execute
main main