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

Applied shellcheck

Browse source
This commit is contained in:
Suikan 2021-07-03 08:17:36 +09:00
parent b9e490e5f3
commit dc1e8ff720
5 changed files with 63 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

20
script/lib/confirmation_common.sh
View file

@ -6,7 +6,7 @@
function confirmation_common(){ function confirmation_common(){
# Consistency check for the OVERWRITEINSTALL and ERASEALL # Consistency check for the OVERWRITEINSTALL and ERASEALL
if [ ${ERASEALL} -eq 1 -a ${OVERWRITEINSTALL} -eq 1 ] ; then if [ "${ERASEALL}" -eq 1 ] && [ "${OVERWRITEINSTALL}" -eq 1 ] ; then
cat <<- HEREDOC cat <<- HEREDOC
***** ERROR : Confliction between ERASEALL and OVERWRITEINSTALL ***** ***** ERROR : Confliction between ERASEALL and OVERWRITEINSTALL *****
...ERASEALL = ${ERASEALL} ...ERASEALL = ${ERASEALL}
@ -19,7 +19,7 @@ function confirmation_common(){
fi fi
# Sanity check for volume group name # Sanity check for volume group name
if echo ${VGNAME} | grep "-" -i > /dev/null ; then # "-" is found in the volume group name. if echo "${VGNAME}" | grep "-" -i > /dev/null ; then # "-" is found in the volume group name.
cat <<- HEREDOC cat <<- HEREDOC
***** ERROR : VGNAME is "${VGNAME}" ***** ***** ERROR : VGNAME is "${VGNAME}" *****
..."-" is not allowed in the volume name. ..."-" is not allowed in the volume name.
@ -31,7 +31,7 @@ function confirmation_common(){
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
if echo ${LVROOTNAME} | grep "-" -i > /dev/null ; then # "-" is found in the volume name. if echo "${LVROOTNAME}" | grep "-" -i > /dev/null ; then # "-" is found in the volume name.
cat <<- HEREDOC cat <<- HEREDOC
***** ERROR : LVROOTNAME is "${LVROOTNAME}" ***** ***** ERROR : LVROOTNAME is "${LVROOTNAME}" *****
..."-" is not allowed in the volume name. ..."-" is not allowed in the volume name.
@ -43,7 +43,7 @@ function confirmation_common(){
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
if echo ${LVSWAPNAME} | grep "-" -i > /dev/null ; then # "-" is found in the volume name. if echo "${LVSWAPNAME}" | grep "-" -i > /dev/null ; then # "-" is found in the volume name.
cat <<- HEREDOC cat <<- HEREDOC
***** ERROR : LVSWAPNAME is "${LVSWAPNAME}" ***** ***** ERROR : LVSWAPNAME is "${LVSWAPNAME}" *****
..."-" is not allowed in the volume name. ..."-" is not allowed in the volume name.
@ -61,8 +61,8 @@ function confirmation_common(){
"${LVROOTNAME}" uses ${LVROOTSIZE} of the LVM volume group. "${LVROOTNAME}" uses ${LVROOTSIZE} of the LVM volume group.
Are you sure to install? [Y/N] Are you sure to install? [Y/N]
HEREDOC HEREDOC
read YESNO read -r YESNO
if [ ${YESNO} != "Y" -a ${YESNO} != "y" ] ; then if [ "${YESNO}" != "Y" ] && [ "${YESNO}" != "y" ] ; then
cat <<- HEREDOC cat <<- HEREDOC
...Installation process terminated.. ...Installation process terminated..
@ -71,10 +71,10 @@ function confirmation_common(){
fi # if YES fi # if YES
# For sure ask to be sure to erase. # For sure ask to be sure to erase.
if [ ${ERASEALL} -eq 1 ] ; then if [ "${ERASEALL}" -eq 1 ] ; then
echo "Are you sure you want to erase entire ${DEV}? [Y/N]" echo "Are you sure you want to erase entire ${DEV}? [Y/N]"
read YESNO read -r YESNO
if [ ${YESNO} != "Y" -a ${YESNO} != "y" ] ; then if [ "${YESNO}" != "Y" ] && [ "${YESNO}" != "y" ] ; then
cat <<-HEREDOC cat <<-HEREDOC
...Check your config.sh. The variable ERASEALL is ${ERASEALL}. ...Check your config.sh. The variable ERASEALL is ${ERASEALL}.
@ -95,7 +95,7 @@ function confirmation_common(){
read -sr PASSPHRASE_C read -sr PASSPHRASE_C
# Validate whether both are indentical or not # Validate whether both are indentical or not
if [ ${PASSPHRASE} != ${PASSPHRASE_C} ] ; then if [ "${PASSPHRASE}" != "${PASSPHRASE_C}" ] ; then
cat <<-HEREDOC cat <<-HEREDOC
***** ERROR : Passphrase doesn't match ***** ***** ERROR : Passphrase doesn't match *****

4
script/lib/para_install_msg_common.sh
View file

@ -14,7 +14,7 @@ function para_install_msg_common() {
HEREDOC HEREDOC
# In the EFI system, add this mapping # In the EFI system, add this mapping
if [ ${ISEFI} -eq 1 ] ; then if [ "${ISEFI}" -eq 1 ] ; then
echo "/boot/efi : ${DEV}${EFIPARTITION}" echo "/boot/efi : ${DEV}${EFIPARTITION}"
fi fi
@ -22,7 +22,7 @@ function para_install_msg_common() {
echo "/ : /dev/mapper/${VGNAME}-${LVROOTNAME}" echo "/ : /dev/mapper/${VGNAME}-${LVROOTNAME}"
# In case of erased storage, add this mapping # In case of erased storage, add this mapping
if [ ${ERASEALL} -eq 1 ] ; then if [ "${ERASEALL}" -eq 1 ] ; then
echo "swap : /dev/mapper/${VGNAME}-${LVSWAPNAME}" echo "swap : /dev/mapper/${VGNAME}-${LVSWAPNAME}"
fi fi

58
script/lib/pre_install_common.sh
View file

@ -7,49 +7,49 @@ function pre_install_common() {
# ----- Erase entire disk, create partitions, format them and encrypt the LUKS partition ----- # ----- Erase entire disk, create partitions, format them and encrypt the LUKS partition -----
if [ ${ERASEALL} -eq 1 ] ; then if [ "${ERASEALL}" -eq 1 ] ; then
# Assign specified space and rest of disk to the EFI and LUKS partition, respectively. # Assign specified space and rest of disk to the EFI and LUKS partition, respectively.
if [ ${ISEFI} -eq 1 ] ; then if [ "${ISEFI}" -eq 1 ] ; then
# Zap existing partition table and create new GPT # Zap existing partition table and create new GPT
echo "...Initializing ${DEV} with GPT." echo "...Initializing \"${DEV}\" with GPT."
sgdisk --zap-all "${DEV}" sgdisk --zap-all "${DEV}"
# Create EFI partition and format it # Create EFI partition and format it
echo "...Creating an EFI partition on ${DEV}." echo "...Creating an EFI partition on \"${DEV}\"."
sgdisk --new=${EFIPARTITION}:0:+${EFISIZE} --change-name=${EFIPARTITION}:"EFI System" --typecode=${EFIPARTITION}:ef00 "${DEV}" sgdisk --new="${EFIPARTITION}":0:+"${EFISIZE}" --change-name="${EFIPARTITION}":"EFI System" --typecode="${EFIPARTITION}":ef00 "${DEV}"
echo "...Formatting the EFI parttion." echo "...Formatting the EFI parttion."
mkfs.vfat -F 32 -n EFI-SP "${DEV}${EFIPARTITION}" mkfs.vfat -F 32 -n EFI-SP "${DEV}${EFIPARTITION}"
# Create Linux partition # Create Linux partition
echo "...Creating a Linux partition on ${DEV}." echo "...Creating a Linux partition on ${DEV}."
sgdisk --new=${CRYPTPARTITION}:0:0 --change-name=${CRYPTPARTITION}:"Linux LUKS" --typecode=${CRYPTPARTITION}:8309 "${DEV}" sgdisk --new="${CRYPTPARTITION}":0:0 --change-name="${CRYPTPARTITION}":"Linux LUKS" --typecode="${CRYPTPARTITION}":8309 "${DEV}"
# Then print them # Then print them
sgdisk --print "${DEV}" sgdisk --print "${DEV}"
else else
# Zap existing partition table # Zap existing partition table
echo "...Erasing partition table of ${DEV}." echo "...Erasing partition table of \"${DEV}\"."
dd if=/dev/zero of=${DEV} bs=512 count=1 dd if=/dev/zero of="${DEV}" bs=512 count=1
# Create MBR and allocate max storage for Linux partition # Create MBR and allocate max storage for Linux partition
echo "...Creating a Linux partition on ${DEV} with MBR." echo "...Creating a Linux partition on ${DEV} with MBR."
sfdisk ${DEV} <<- HEREDOC sfdisk "${DEV}" <<- HEREDOC
2M,,L 2M,,L
HEREDOC HEREDOC
fi # if EFI firmware fi # if EFI firmware
# Encrypt the partition to install Linux # Encrypt the partition to install Linux
echo "...Initializing ${DEV}${CRYPTPARTITION} as crypt partition" echo "...Initializing \"${DEV}${CRYPTPARTITION}\" as crypt partition"
printf %s "${PASSPHRASE}" | cryptsetup luksFormat --type=luks1 --key-file - --batch-mode "${DEV}${CRYPTPARTITION}" printf %s "${PASSPHRASE}" | cryptsetup luksFormat --type=luks1 --key-file - --batch-mode "${DEV}${CRYPTPARTITION}"
fi # if erase all fi # if erase all
# ----- Open the LUKS partition ----- # ----- Open the LUKS partition -----
# Open the crypt partition. # Open the crypt partition.
echo "...Opening a crypt partition ${DEV}${CRYPTPARTITION} as \"${CRYPTPARTNAME}\"" echo "...Opening a crypt partition \"${DEV}${CRYPTPARTITION}\" as \"${CRYPTPARTNAME}\""
printf %s "${PASSPHRASE}" | cryptsetup open -d - "${DEV}${CRYPTPARTITION}" ${CRYPTPARTNAME} printf %s "${PASSPHRASE}" | cryptsetup open -d - "${DEV}${CRYPTPARTITION}" "${CRYPTPARTNAME}"
# Check whether successful open. If mapped, it is successful. # Check whether successful open. If mapped, it is successful.
if [ ! -e /dev/mapper/${CRYPTPARTNAME} ] ; then if [ ! -e /dev/mapper/"${CRYPTPARTNAME}" ] ; then
cat <<- HEREDOC cat <<- HEREDOC
***** ERROR : Cannot open LUKS volume "${CRYPTPARTNAME}" on ${DEV}${CRYPTPARTITION}. ***** ***** ERROR : Cannot open LUKS volume "${CRYPTPARTNAME}" on "${DEV}${CRYPTPARTITION}". *****
...Check passphrase and your config.txt ...Check passphrase and your config.txt
...Installation process terminated.. ...Installation process terminated..
@ -59,38 +59,38 @@ function pre_install_common() {
# ----- Configure the LVM in LUKS volume ----- # ----- Configure the LVM in LUKS volume -----
# Check volume group ${VGNAME} exist or not # Check volume group ${VGNAME} exist or not
if vgdisplay -s ${VGNAME} &> /dev/null ; then # if exist if vgdisplay -s "${VGNAME}" &> /dev/null ; then # if exist
echo "...Volume group ${VGNAME} already exist. Skipped to create. No problem." echo "...Volume group \"${VGNAME}\" already exist. Skipped to create. No problem."
echo "...Activating all logical volumes in volume group \"${VGNAME}\"." echo "...Activating all logical volumes in volume group \"${VGNAME}\"."
vgchange -ay vgchange -ay
else else
echo "...Initializing a physical volume on \"${CRYPTPARTNAME}\"" echo "...Initializing a physical volume on \"${CRYPTPARTNAME}\""
pvcreate /dev/mapper/${CRYPTPARTNAME} pvcreate /dev/mapper/"${CRYPTPARTNAME}"
echo "...And then creating Volume group \"${VGNAME}\"." echo "...And then creating Volume group \"${VGNAME}\"."
vgcreate ${VGNAME} /dev/mapper/${CRYPTPARTNAME} vgcreate "${VGNAME}" /dev/mapper/"${CRYPTPARTNAME}"
fi # if /dev/volume-groupt exist fi # if /dev/volume-groupt exist
# Create a SWAP Logical Volume on VG, if it doesn't exist # Create a SWAP Logical Volume on VG, if it doesn't exist
if [ -e /dev/mapper/${VGNAME}-${LVSWAPNAME} ] ; then if [ -e /dev/mapper/"${VGNAME}"-"${LVSWAPNAME}" ] ; then
echo "...Swap volume already exist. Skipped to create. No problem." echo "...Swap volume already exist. Skipped to create. No problem."
else else
echo "...Creating logical volume \"${LVSWAPNAME}\" on \"${VGNAME}\"." echo "...Creating logical volume \"${LVSWAPNAME}\" on \"${VGNAME}\"."
lvcreate -L ${LVSWAPSIZE} -n ${LVSWAPNAME} ${VGNAME} lvcreate -L "${LVSWAPSIZE}" -n "${LVSWAPNAME}" "${VGNAME}"
fi # if /dev/mapper/swap volume already exit. fi # if /dev/mapper/swap volume already exit.
# Create a ROOT Logical Volume on VG. # Create a ROOT Logical Volume on VG.
if [ -e /dev/mapper/${VGNAME}-${LVROOTNAME} ] ; then # exist if [ -e /dev/mapper/"${VGNAME}"-"${LVROOTNAME}" ] ; then # exist
if [ ${OVERWRITEINSTALL} -eq 1 ] ; then # exist and overwrite install if [ "${OVERWRITEINSTALL}" -eq 1 ] ; then # exist and overwrite install
echo "...Logical volume "${VGNAME}-${LVROOTNAME}" already exists. OK." echo "...Logical volume \"${VGNAME}-${LVROOTNAME}\" already exists. OK."
else # exist and not overwriteinstall else # exist and not overwriteinstall
cat <<- HEREDOC cat <<- HEREDOC
***** ERROR : Logical volume "${VGNAME}-${LVROOTNAME}" already exists. ***** ***** ERROR : Logical volume "${VGNAME}-${LVROOTNAME}" already exists. *****
...Check LVROOTNAME environment variable in your config.txt. ...Check LVROOTNAME environment variable in your config.txt.
HEREDOC HEREDOC
echo "...Deactivating all logical volumes in volume group \"${VGNAME}\"." echo "...Deactivating all logical volumes in volume group \"${VGNAME}\"."
vgchange -a n ${VGNAME} vgchange -a n "${VGNAME}"
echo "...Closing LUKS volume \"${CRYPTPARTNAME}\"." echo "...Closing LUKS volume \"${CRYPTPARTNAME}\"."
cryptsetup close ${CRYPTPARTNAME} cryptsetup close "${CRYPTPARTNAME}"
cat <<- HEREDOC cat <<- HEREDOC
...Installation process terminated.. ...Installation process terminated..
@ -98,15 +98,15 @@ function pre_install_common() {
return 1 # with error status return 1 # with error status
fi fi
else # not exsit else # not exsit
if [ ${OVERWRITEINSTALL} -eq 1 ] ; then if [ "${OVERWRITEINSTALL}" -eq 1 ] ; then
cat <<- HEREDOC cat <<- HEREDOC
***** ERROR : Logical volume "${VGNAME}-${LVROOTNAME}" doesn't exist while overwrite install. ***** ***** ERROR : Logical volume "${VGNAME}-${LVROOTNAME}" doesn't exist while overwrite install. *****
...Check consistency of your config.txt. ...Check consistency of your config.txt.
HEREDOC HEREDOC
echo "...Deactivate all logical volumes in volume group \"${VGNAME}\"." echo "...Deactivate all logical volumes in volume group \"${VGNAME}\"."
vgchange -a n ${VGNAME} vgchange -a n "${VGNAME}"
echo "...Closing LUKS volume \"${CRYPTPARTNAME}\"." echo "...Closing LUKS volume \"${CRYPTPARTNAME}\"."
cryptsetup close ${CRYPTPARTNAME} cryptsetup close "${CRYPTPARTNAME}"
cat <<- HEREDOC cat <<- HEREDOC
...Installation process terminated.. ...Installation process terminated..
@ -114,7 +114,7 @@ function pre_install_common() {
return 1 # with error status return 1 # with error status
else # not exist and not overwrite install else # not exist and not overwrite install
echo "...Creating logical volume \"${LVROOTNAME}\" on \"${VGNAME}\"." echo "...Creating logical volume \"${LVROOTNAME}\" on \"${VGNAME}\"."
lvcreate -l ${LVROOTSIZE} -n ${LVROOTNAME} ${VGNAME} lvcreate -l "${LVROOTSIZE}" -n "${LVROOTNAME}" "${VGNAME}"
fi fi
fi fi

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

@ -1,6 +1,6 @@
#!/bin/bash -u #!/bin/bash -u
function main() { # shellcheck disable=SC1091
# Load configuration parameter # Load configuration parameter
source config.sh source config.sh
@ -9,6 +9,7 @@ function main() {
source lib/pre_install_common.sh source lib/pre_install_common.sh
source lib/para_install_msg_common.sh source lib/para_install_msg_common.sh
function main() {
# This is the mount point of the install target. # This is the mount point of the install target.
export TARGETMOUNTPOINT="/target" export TARGETMOUNTPOINT="/target"
@ -22,8 +23,8 @@ function main() {
This system seems to be not Ubuntu, while this script is dediated to the Ubuntu. This system seems to be not Ubuntu, while this script is dediated to the Ubuntu.
Are you sure you want to run this script? [Y/N] Are you sure you want to run this script? [Y/N]
HEREDOC HEREDOC
read YESNO read -r YESNO
if [ ${YESNO} != "Y" -a ${YESNO} != "y" ] ; then if [ "${YESNO}" != "Y" ] && [ "${YESNO}" != "y" ] ; then
cat <<- HEREDOC cat <<- HEREDOC
...Installation process terminated.. ...Installation process terminated..
@ -72,7 +73,7 @@ function main() {
HEREDOC HEREDOC
# waitfor a console input # waitfor a console input
read dummy_var read -r
# Start Ubiquity installer # Start Ubiquity installer
ubiquity & ubiquity &
@ -106,7 +107,7 @@ function post_install() {
## Mount the target file system ## Mount the target file system
# ${TARGETMOUNTPOINT} is created by the GUI/TUI installer # ${TARGETMOUNTPOINT} is created by the GUI/TUI installer
echo "...Mounting /dev/mapper/${VGNAME}-${LVROOTNAME} on ${TARGETMOUNTPOINT}." echo "...Mounting /dev/mapper/${VGNAME}-${LVROOTNAME} on ${TARGETMOUNTPOINT}."
mount /dev/mapper/${VGNAME}-${LVROOTNAME} ${TARGETMOUNTPOINT} mount /dev/mapper/"${VGNAME}"-"${LVROOTNAME}" ${TARGETMOUNTPOINT}
# And mount other directories # And mount other directories
echo "...Mounting all other dirs." echo "...Mounting all other dirs."
@ -135,7 +136,7 @@ function post_install() {
# Add the LUKS volume information to /etc/crypttab to decrypt by kernel. # Add the LUKS volume information to /etc/crypttab to decrypt by kernel.
echo "...Adding LUKS volume info to /etc/crypttab." echo "...Adding LUKS volume info to /etc/crypttab."
echo "${CRYPTPARTNAME} UUID=$(blkid -s UUID -o value ${DEV}${CRYPTPARTITION}) /etc/luks/boot_os.keyfile luks,discard" >> /etc/crypttab echo "${CRYPTPARTNAME} UUID=$(blkid -s UUID -o value "${DEV}${CRYPTPARTITION}") /etc/luks/boot_os.keyfile luks,discard" >> /etc/crypttab
# Putting key file into the ramfs initial image # Putting key file into the ramfs initial image
echo "...Registering key file to the ramfs" echo "...Registering key file to the ramfs"
@ -178,14 +179,14 @@ function grub_check_and_modify() {
# Check if installer still exist # Check if installer still exist
if ! ps $INSTALLER_PID > /dev/null ; then # If not exists if ! ps $INSTALLER_PID > /dev/null ; then # If not exists
echo "***** ERROR : The GUI/TUI installer terminated unexpectedly. *****" echo "***** ERROR : The GUI/TUI installer terminated unexpectedly. *****"
if [ ${OVERWRITEINSTALL} -eq 0 ] ; then # If not over install, volume is new. So delete it if [ "${OVERWRITEINSTALL}" -eq 0 ] ; then # If not over install, volume is new. So delete it
echo "...Deleting the new logical volume \"${VGNAME}-${LVROOTNAME}\"." echo "...Deleting the new logical volume \"${VGNAME}-${LVROOTNAME}\"."
lvremove -f /dev/mapper/${VGNAME}-${LVROOTNAME} lvremove -f /dev/mapper/"${VGNAME}"-"${LVROOTNAME}"
fi fi
echo "...Deactivating all logical volumes in volume group \"${VGNAME}\"." echo "...Deactivating all logical volumes in volume group \"${VGNAME}\"."
vgchange -a n ${VGNAME} vgchange -a n "${VGNAME}"
echo "...Closing LUKS volume \"${CRYPTPARTNAME}\"." echo "...Closing LUKS volume \"${CRYPTPARTNAME}\"."
cryptsetup close ${CRYPTPARTNAME} cryptsetup close "${CRYPTPARTNAME}"
cat <<-HEREDOC cat <<-HEREDOC
...The new logical volume has been deleted. You can retry Kaiten-yaki again. ...The new logical volume has been deleted. You can retry Kaiten-yaki again.

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

@ -1,6 +1,6 @@
#!/bin/bash -u #!/bin/bash -u
function main() { # shellcheck disable=SC1091
# Load configuration parameter # Load configuration parameter
source config.sh source config.sh
@ -9,6 +9,7 @@ function main() {
source lib/pre_install_common.sh source lib/pre_install_common.sh
source lib/para_install_msg_common.sh source lib/para_install_msg_common.sh
function main() {
# This is the mount point of the install target. # This is the mount point of the install target.
export TARGETMOUNTPOINT="/mnt/target" export TARGETMOUNTPOINT="/mnt/target"
@ -22,8 +23,8 @@ function main() {
This system seems to be not Void Linux, while this script is dediated to the Void Linux. This system seems to be not Void Linux, while this script is dediated to the Void Linux.
Are you sure you want to run this script for installation? [Y/N] Are you sure you want to run this script for installation? [Y/N]
HEREDOC HEREDOC
read YESNO read -r YESNO
if [ ${YESNO} != "Y" -a ${YESNO} != "y" ] ; then if [ "${YESNO}" != "Y" ] && [ "${YESNO}" != "y" ] ; then
cat <<- HEREDOC cat <<- HEREDOC
...Installation process terminated.. ...Installation process terminated..
@ -81,7 +82,7 @@ function main() {
HEREDOC HEREDOC
# waitfor a console input # waitfor a console input
read dummy_var read -r
# Start the background target/etc/default/grub cheker. # Start the background target/etc/default/grub cheker.
# The definition of this function is down below. # The definition of this function is down below.
@ -98,14 +99,14 @@ function main() {
# If exist, the grub was not modifyed -> void-installer termianted unexpectedly # If exist, the grub was not modifyed -> void-installer termianted unexpectedly
echo "***** ERROR : The GUI/TUI installer terminated unexpectedly. *****" echo "***** ERROR : The GUI/TUI installer terminated unexpectedly. *****"
if [ ${OVERWRITEINSTALL} -eq 0 ] ; then # If not over install, volume is new. So delete it if [ "${OVERWRITEINSTALL}" -eq 0 ] ; then # If not over install, volume is new. So delete it
echo "...Deleting the new logical volume \"${VGNAME}-${LVROOTNAME}\"." echo "...Deleting the new logical volume \"${VGNAME}-${LVROOTNAME}\"."
lvremove -f /dev/mapper/${VGNAME}-${LVROOTNAME} lvremove -f /dev/mapper/"${VGNAME}"-"${LVROOTNAME}"
fi fi
echo "...Deactivating all logical volumes in volume group \"${VGNAME}\"." echo "...Deactivating all logical volumes in volume group \"${VGNAME}\"."
vgchange -a n ${VGNAME} vgchange -a n "${VGNAME}"
echo "...Closing LUKS volume \"${CRYPTPARTNAME}\"." echo "...Closing LUKS volume \"${CRYPTPARTNAME}\"."
cryptsetup close ${CRYPTPARTNAME} cryptsetup close "${CRYPTPARTNAME}"
cat <<-HEREDOC cat <<-HEREDOC
...The new logical volume has been deleted. You can retry Kaiten-yaki again. ...The new logical volume has been deleted. You can retry Kaiten-yaki again.
@ -133,7 +134,7 @@ function post_install() {
## Mount the target file system ## Mount the target file system
# ${TARGETMOUNTPOINT} is created by the GUI/TUI installer # ${TARGETMOUNTPOINT} is created by the GUI/TUI installer
echo "...Mounting /dev/mapper/${VGNAME}-${LVROOTNAME} on ${TARGETMOUNTPOINT}." echo "...Mounting /dev/mapper/${VGNAME}-${LVROOTNAME} on ${TARGETMOUNTPOINT}."
mount /dev/mapper/${VGNAME}-${LVROOTNAME} ${TARGETMOUNTPOINT} mount /dev/mapper/"${VGNAME}"-"${LVROOTNAME}" ${TARGETMOUNTPOINT}
# And mount other directories # And mount other directories
echo "...Mounting all other dirs." echo "...Mounting all other dirs."
@ -162,7 +163,7 @@ function post_install() {
# Add the LUKS volume information to /etc/crypttab to decrypt by kernel. # Add the LUKS volume information to /etc/crypttab to decrypt by kernel.
echo "...Adding LUKS volume info to /etc/crypttab." echo "...Adding LUKS volume info to /etc/crypttab."
echo "${CRYPTPARTNAME} UUID=$(blkid -s UUID -o value ${DEV}${CRYPTPARTITION}) /etc/luks/boot_os.keyfile luks,discard" >> /etc/crypttab echo "${CRYPTPARTNAME} UUID=$(blkid -s UUID -o value "${DEV}""${CRYPTPARTITION}") /etc/luks/boot_os.keyfile luks,discard" >> /etc/crypttab
# Putting key file into the ramfs initial image # Putting key file into the ramfs initial image
echo "...Registering key file to the ramfs" echo "...Registering key file to the ramfs"