From 831b4c20d12d733018edc4c99b884c0d7e08a794 Mon Sep 17 00:00:00 2001
From: Suikan <26223147+suikan4github@users.noreply.github.com>
Date: Tue, 29 Jun 2021 08:27:56 +0900
Subject: [PATCH] echo message is easier to read

---
 ubuntu/1-pre-install.sh  | 28 ++++++++++++++--------------
 ubuntu/2-para-install.sh |  2 +-
 ubuntu/3-post-install.sh | 16 ++++++++--------
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/ubuntu/1-pre-install.sh b/ubuntu/1-pre-install.sh
index 8127b64..da8e114 100644
--- a/ubuntu/1-pre-install.sh
+++ b/ubuntu/1-pre-install.sh
@@ -67,38 +67,38 @@ if [ ${ERASEALL} -eq 1 ] ; then
 	# Assign specified space and rest of disk to the EFI and LUKS partition, respectively.
 	if [  ${ISEFI} -eq 1 ] ; then
 		# Zap existing partition table and create new GPT
-		echo "Initialize ${DEV} with GPT."
+		echo "...Initialize ${DEV} with GPT."
 		sgdisk --zap-all "${DEV}"
 		# Create EFI partition and format it
-		echo "Create an EFI partition on ${DEV}."
+		echo "...Create an EFI partition on ${DEV}."
 		sgdisk --new=${EFIPARTITION}:0:+${EFISIZE} --change-name=${EFIPARTITION}:"EFI System"  --typecode=${EFIPARTITION}:ef00 "${DEV}"  
-		echo "Format the EFI parttion."
+		echo "...Format the EFI parttion."
 		mkfs.vfat -F 32 -n EFI-SP "${DEV}${EFIPARTITION}"
 		# Create Linux partition
-		echo "Create a Linux partition on ${DEV}."
+		echo "...Create a Linux partition on ${DEV}."
 		sgdisk --new=${CRYPTPARTITION}:0:0    --change-name=${CRYPTPARTITION}:"Linux LUKS" --typecode=${CRYPTPARTITION}:8309 "${DEV}"
 		# Then print them
 		sgdisk --print "${DEV}"
 	else
 		# Zap existing partition table
-		echo "Erase partition table of ${DEV}."
+		echo "...Erase partition table of ${DEV}."
 		dd if=/dev/zero of=${DEV} bs=512 count=1
 		# Create MBR and allocate max storage for Linux partition
-		echo "Create a Linux partition on ${DEV} with MBR."
+		echo "...Create a Linux partition on ${DEV} with MBR."
 		sfdisk ${DEV} <<HEREDOC
 2M,,L
 HEREDOC
 	fi	# if EFI firmware
 
 	# Encrypt the partition to install Linux
-	echo "Initialize ${DEV}${CRYPTPARTITION} as crypt partition"
+	echo "...Initialize ${DEV}${CRYPTPARTITION} as crypt partition"
 	printf %s "${PASSPHRASE}" | cryptsetup luksFormat --type=luks1 --key-file - --batch-mode "${DEV}${CRYPTPARTITION}"
 
 fi	# if erase all
 
 # ----- Open the LUKS partition -----
 # Open the crypt partition. 
-echo "Open a crypt partition ${DEV}${CRYPTPARTITION} as ${CRYPTPARTNAME}"
+echo "...Open a crypt partition ${DEV}${CRYPTPARTITION} as ${CRYPTPARTNAME}"
 printf %s "${PASSPHRASE}" | cryptsetup open -d - "${DEV}${CRYPTPARTITION}" ${CRYPTPARTNAME}
 
 # Check whether successful open. If mapped, it is successful. 
@@ -115,19 +115,19 @@ fi	# if crypt volume is unable to open
 # ----- Configure the LVM in LUKS volume -----
 # Create a Physical Volume and Volume Group, if not exist
 if [ -e /dev/${VGNAME} ]; then
-	echo "Volume group ${VGNAME} already exist. Skipped to create"
+	echo "...Volume group ${VGNAME} already exist. Skipped to create"
 else
-	echo "Initialize a physical volume on ${CRYPTPARTNAME}"
+	echo "...Initialize a physical volume on ${CRYPTPARTNAME}"
 	pvcreate /dev/mapper/${CRYPTPARTNAME}
-	echo "and then create Volume group ${VGNAME}."
+	echo "...And then create Volume group ${VGNAME}."
 	vgcreate ${VGNAME} /dev/mapper/${CRYPTPARTNAME}
 fi # if /dev/volume-groupt not exist
 
 # Create a SWAP Logical Volume on VG, if it doesn't exist
 if [ -e /dev/mapper/${VGNAME}-${LVSWAPNAME} ] ; then 
-	echo "Swap volume already exist. Skipped to create"
+	echo "...Swap volume already exist. Skipped to create"
 else
-	echo "Create logical volume ${LVSWAPNAME} on ${VGNAME}."
+	echo "...Create logical volume ${LVSWAPNAME} on ${VGNAME}."
 	lvcreate -L ${LVSWAPSIZE} -n ${LVSWAPNAME} ${VGNAME} 
 fi	# if /dev/mapper/swap volume already exit. 
 
@@ -141,7 +141,7 @@ Installation terminated.
 HEREDOC
 	return
 else
-	echo "Create logical volume ${LVROOTNAME} on ${VGNAME}."
+	echo "...Create logical volume ${LVROOTNAME} on ${VGNAME}."
 	lvcreate -l ${LVROOTSIZE} -n ${LVROOTNAME} ${VGNAME}
 fi	# if the root volun already exist
 
diff --git a/ubuntu/2-para-install.sh b/ubuntu/2-para-install.sh
index 36dcd4a..96071b8 100644
--- a/ubuntu/2-para-install.sh
+++ b/ubuntu/2-para-install.sh
@@ -26,7 +26,7 @@ HEREDOC
 fi  # if grub file exists
 
 # Make target GRUB aware to the crypt partition
-echo "add GRUB_ENABLE_CRYPTODISK entry to /target/etc/default/grub "
+echo "...add GRUB_ENABLE_CRYPTODISK entry to /target/etc/default/grub "
 echo "GRUB_ENABLE_CRYPTODISK=y" >> /target/etc/default/grub
 
 # Finishing message
diff --git a/ubuntu/3-post-install.sh b/ubuntu/3-post-install.sh
index eb98c15..fde79e4 100644
--- a/ubuntu/3-post-install.sh
+++ b/ubuntu/3-post-install.sh
@@ -15,11 +15,11 @@ fi # "sourced" validation
 
 ## Mount the target file system
 # /target is created by the Ubiquity installer
-echo "Mount /dev/mapper/${VGNAME}-${LVROOTNAME} on /target."
+echo "...Mount /dev/mapper/${VGNAME}-${LVROOTNAME} on /target."
 mount /dev/mapper/${VGNAME}-${LVROOTNAME} /target
 
 # And mount other directories
-echo "Mount all other dirs."
+echo "...Mount all other dirs."
 for n in proc sys dev etc/resolv.conf; do mount --rbind "/$n" "/target/$n"; done
 
 # Change root and create the keyfile and ramfs image for Linux kernel. 
@@ -29,29 +29,29 @@ cat <<HEREDOC | chroot /target /bin/bash
 mount -a
 
 # Set up the kernel hook of encryption
-echo "install cryptsetup-initramfs package."
+echo "...Install cryptsetup-initramfs package."
 apt install -y cryptsetup-initramfs
-echo "Register key file to the ramfs"
+echo "...Register key file to the ramfs"
 echo "KEYFILE_PATTERN=/etc/luks/*.keyfile" >> /etc/cryptsetup-initramfs/conf-hook
 echo "UMASK=0077" >> /etc/initramfs-tools/initramfs.conf
 
 # Prepare a key file to embed in to the ramfs.
-echo "Prepair key file."
+echo "...Prepair key file."
 mkdir /etc/luks
 dd if=/dev/urandom of=/etc/luks/boot_os.keyfile bs=4096 count=1
 chmod u=rx,go-rwx /etc/luks
 chmod u=r,go-rwx /etc/luks/boot_os.keyfile
 
 # Add a key to the key file. Use the passphrase in the environment variable. 
-echo "Add a key to the key file."
+echo "...Add a key to the key file."
 printf %s "${PASSPHRASE}" | cryptsetup luksAddKey -d - "${DEV}${CRYPTPARTITION}" /etc/luks/boot_os.keyfile
 
 # Add the LUKS volume information to /etc/crypttab to decrypt by kernel.  
-echo "Add LUKS volume info to /etc/crypttab."
+echo "...Add 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
 
 # Finally, update the ramfs initial image with the key file. 
-echo "Upadte initramfs."
+echo "...Upadte initramfs."
 update-initramfs -uk all
 
 # Leave chroot