Merge branch 'cleanup' into chapter7

2 files changed, 6 insertions, 4 deletions

diff --git a/lfs.sh b/lfs.sh
index 555221d..e4740da 100755
--- a/lfs.sh
+++ b/lfs.sh
@@ -49,12 +49,14 @@ printf "%b" "${GRN}Creating LFS directory at ${YLW}${LFS}${GRN} if it does not e
 # Setup partition, filesystem, format and mount if
 # LFS filesystem is not previously mounted
 if ! grep -q "${LFS}" /proc/mounts; then
-	printf "%b" "${GRN}Setting up partition on ${YLW}${LFS_DISK} ${GRN}\
-with ${YLW}ext4${GRN} filesystem at ${YLW}${LFS_DISK}${LFS_ROOT} ${GRN}\
-and mounting at ${YLW}${LFS}${RST}...\n"
+	printf "%b" "${GRN}Preparing LFS partition and filesystem${RST}...\n"
 
     source setupdisk.sh "${LFS_DISK}" "${LFS_PART}"
+	printf "%b" "  ${IGRN}Mounting ${IWHT}${LFS_DISK}${LFS_PART} ${IGRN}at \
+${IWHT}${LFS}${RST}\n"
     sudo mount "${LFS_DISK}${LFS_PART}" "${LFS}"
+	printf "%b" "  ${IGRN}Changing ownership of ${IWHT}${LFS} ${IGRN} \
+to user ${IWHT}${USER}${RST}\n"
     sudo chown -v "${USER}" "${LFS}"
 fi
 
diff --git a/setupdisk.sh b/setupdisk.sh
index 0a058c7..569cb2d 100644
--- a/setupdisk.sh
+++ b/setupdisk.sh
@@ -22,5 +22,5 @@ q
 EOF
 
 printf "%b" "  ${IGRN}Formatting ${IWHT}${LFS_DISK}${LFS_PART} with \
-${YLW}EXT4${IGRN} filesystem and label ${IWHT}${LFS_VER}${RST}...\n"
+${YLW}EXT4${IGRN} filesystem and label ${IWHT}${LFS_VER}${RST}\n"
 sudo /sbin/mkfs -t ext4 -L "${LFS_VER}" -F "${LFS_DISK}${LFS_PART}" >/dev/null 2>&1