From 20d984a61ad8a12fc71f2b00ed92ccc6afef0a79 Mon Sep 17 00:00:00 2001
From: Suikan <26223147+suikan4github@users.noreply.github.com>
Date: Tue, 29 Jun 2021 09:29:23 +0900
Subject: [PATCH] Update comment and supress noise

---
 ubuntu/1-pre-install.sh  | 2 +-
 ubuntu/2-para-install.sh | 5 ++---
 ubuntu/3-post-install.sh | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/ubuntu/1-pre-install.sh b/ubuntu/1-pre-install.sh
index 6ed9247..67ac9c8 100644
--- a/ubuntu/1-pre-install.sh
+++ b/ubuntu/1-pre-install.sh
@@ -149,7 +149,7 @@ fi	# if the root volun already exist
 # Finishing message
 cat <<HEREDOC
 
-1-pre-install.sh : Done. Next, run the Ubiquity installer.
+1-pre-install.sh : Done. 
 
 HEREDOC
 
diff --git a/ubuntu/2-para-install.sh b/ubuntu/2-para-install.sh
index 96071b8..0d76d86 100644
--- a/ubuntu/2-para-install.sh
+++ b/ubuntu/2-para-install.sh
@@ -18,7 +18,7 @@ fi # "sourced" validation
 if [ ! -e /target/etc/default/grub ] ; then 
 	cat <<HEREDOC 1>&2
 ***** ERROR : The /target/etc/default/grub is not ready. *****
-Perhaps, to early to execute this script.
+Perhaps, too early to execute this script.
 
 Installation terminated.
 HEREDOC
@@ -26,13 +26,12 @@ 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
 cat <<HEREDOC
 
 2-para-install.sh : Done. 
-Make sure to click "Continue Testing", when the Ubiquity installer finishes. 
 
 HEREDOC
diff --git a/ubuntu/3-post-install.sh b/ubuntu/3-post-install.sh
index fde79e4..7efce6c 100644
--- a/ubuntu/3-post-install.sh
+++ b/ubuntu/3-post-install.sh
@@ -30,7 +30,7 @@ mount -a
 
 # Set up the kernel hook of encryption
 echo "...Install cryptsetup-initramfs package."
-apt install -y cryptsetup-initramfs
+apt -qq install -y cryptsetup-initramfs
 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
@@ -38,7 +38,7 @@ echo "UMASK=0077" >> /etc/initramfs-tools/initramfs.conf
 # Prepare a key file to embed in to the ramfs.
 echo "...Prepair key file."
 mkdir /etc/luks
-dd if=/dev/urandom of=/etc/luks/boot_os.keyfile bs=4096 count=1
+dd if=/dev/urandom of=/etc/luks/boot_os.keyfile bs=4096 count=1 status=none
 chmod u=rx,go-rwx /etc/luks
 chmod u=r,go-rwx /etc/luks/boot_os.keyfile