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

forget to add

Browse source
This commit is contained in:
Suikan 2021-07-02 07:20:28 +09:00
parent a3026f1ced
commit ce949a547a
2 changed files with 7 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

13
script/common/parainstall.sh
View file

@ -27,19 +27,12 @@ function parainstall() {
# 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.
# If the environment is not GUI, keep quiet not to bother the TUI installer.
if [ ${PARAINSTMSG} -eq 1 ]; then
echo "...Add GRUB_ENABLE_CRYPTODISK entry to ${TARGETMOUNTPOINT}/etc/default/grub "
fi
echo "...Add GRUB_ENABLE_CRYPTODISK entry to ${TARGETMOUNTPOINT}/etc/default/grub "
echo "GRUB_ENABLE_CRYPTODISK=y" >> ${TARGETMOUNTPOINT}/etc/default/grub
# And then, wait for the end of installer process
# If the environment is not GUI, keep quiet not to bother the TUI installer.
if [ ${PARAINSTMSG} -eq 1 ]; then
echo "...Waiting for the end of GUI/TUI installer."
fi
wait $installer_pid
echo "...Waiting for the end of GUI/TUI installer."
wait $INSTALLER_PID
# succesfull return
return 0

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

@ -13,8 +13,6 @@ function main() {
# This is the mount point of the install target.
export TARGETMOUNTPOINT="/mnt/target"
# 1 : Show message during GUI/TUI installer, 0 : Do not show.
export PARAINSTMSG=0
# Distribution check
if ! uname -a | grep void -i > /dev/null ; then # "Void" is not found in the OS name.
@ -50,8 +48,7 @@ function main() {
# *******************************************************************************
# Install essential packages.
xbps-install -y -Su xbps gptfdisk
xbps-install -y -Su xbps gptfdisk xterm
# Common part of the pre-install stage
if ! pre_install ; then
@ -85,10 +82,8 @@ function main() {
# waitfor a console input
read dummy_var
# Start void-installer
void-installer &
# Make it foreground
fg
# Start void-installer in the separate window
xterm -fa monospace -fs ${XTERMFONTSIZE} -e void-installer &
# Record the PID of the installer.
export INSTALLER_PID=$!