From 8999cb53387e2007d755d345e452dd9bd65c267f Mon Sep 17 00:00:00 2001 From: William Harrington Date: Fri, 2 Apr 2021 10:37:30 -0500 Subject: Exit when creating partition or filesystem fails. Use LFS_FS variable from env.sh so user can decide which filesystem to use. --- setupdisk.sh | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'setupdisk.sh') diff --git a/setupdisk.sh b/setupdisk.sh index 569cb2d..d9bd8d7 100644 --- a/setupdisk.sh +++ b/setupdisk.sh @@ -20,7 +20,15 @@ p w q EOF - +if [[ "$?" -ne 0 ]]; then + printf "%b" " ${IGRN}Creating partition ${IWHT}${LFS_DISK}${LFS_PART} \ +${IRED}FAILED!${RST}\n" + exit 1 +fi printf "%b" " ${IGRN}Formatting ${IWHT}${LFS_DISK}${LFS_PART} with \ -${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 +${IWHT}${LFS_FS}${IGRN} filesystem and label ${IWHT}${LFS_VER}${RST}\n" +if ! sudo /sbin/mkfs -t ${LFS_FS} -L "${LFS_VER}" -F "${LFS_DISK}${LFS_PART}" >/dev/null 2>&1; then + printf "%b" " ${IGRN}Creating ${IWHT}${LFS_FS}${IGRN} filesystem at \ +${IWHT}${LFS_DISK}${LFS_PART} ${IRED}FAILED!${RST}\n" + exit 1 +fi -- cgit v1.2.3-54-g00ecf