Fix/Add chroot commands. Add cleanup and backup for chapter 8.

1 files changed, 43 insertions, 4 deletions

diff --git a/lfs.sh b/lfs.sh
index 37ae8a2..4d13d2a 100755
--- a/lfs.sh
+++ b/lfs.sh
@@ -151,7 +151,9 @@ sleep 3
 
 # Create chapter7 log directory as non root user
 mkdir -p "${LFS}"/sources/log/chapter7
-sudo chroot "${LFS}" /usr/bin/env \
+
+# Enter CHROOT for chapter 7
+sudo chroot "${LFS}" /usr/bin/env -i \
 	HOME=/root \
 	TERM="${TERM}" \
 	PS1='(lfs chroot) \u:\w\$ ' \
@@ -182,8 +184,11 @@ source mountvirtfs.sh
 printf "%b" "\n${CYN}ENTERING ${RED}CHROOT${CYN} ENVIRONMENT...${RST}\n"
 sleep 3
 
-# Enter CHROOT for chapter 8, 9 and 10
-sudo chroot "${LFS}" /usr/bin/env \
+# Create chapter8 log directory as non root user
+mkdir -p "${LFS}"/sources/log/chapter8
+
+# Enter CHROOT for chapter 8
+sudo chroot "${LFS}" /usr/bin/env -i \
 	HOME=/root \
 	TERM="${TERM}" \
 	PS1='(lfs chroot) \u:\w\$ ' \
@@ -193,5 +198,39 @@ sudo chroot "${LFS}" /usr/bin/env \
 	NINJAJOBS="${NINJAJOBS}" \
 	SPINNER="${SPINNER}" \
 	/bin/bash --login +h -c "/sources/insidechroot.sh 8"
+retval=$?
+
+printf "%b" "\n${CYN}EXITED ${RED}CHROOT${RST} ENVIRONMENT...${RST}\n"
+# Cleanup and Backup if chapter 8 successfully finished
+if [[ "$retval" -eq 0 ]]; then
+	source umountvirtfs.sh
+
+	printf "%b" "\n${IWHT}======= ${IYLW}Chapter 8 ${IGRN}Cleanup and Backup \
+${IWHT}=======${RST}\n"
+	source "${LFS}"/sources/chapter8/cleanup.sh
+	source "${LFS}"/sources/chapter8/backup.sh
+else
+	exit "$retval"
+fi
+
+# Mount virtual kernel filesystems after cleanup and backup
+source mountvirtfs.sh
+
+printf "%b" "\n${CYN}ENTERING ${RED}CHROOT${CYN} ENVIRONMENT...${RST}\n"
+sleep 3
+
+# Enter CHROOT for chapter 9,10
+sudo chroot "${LFS}" /usr/bin/env -i \
+	HOME=/root \
+	TERM="${TERM}" \
+	PS1='(lfs chroot) \u:\w\$ ' \
+	PATH=/bin:/usr/bin:/sbin:/usr/sbin \
+	NUMPROCS="${NUMPROCS}" \
+	MAKEFLAGS="${MAKEFLAGS}" \
+	NINJAJOBS="${NINJAJOBS}" \
+	SPINNER="${SPINNER}" \
+	/bin/bash --login +h -c "/sources/insidechroot.sh 9"
+retval=$?
+
+printf "%b" "\n${CYN}EXITED ${RED}CHROOT${RST} ENVIRONMENT...${RST}\n"
 
-printf "%b" "\n${CYN}EXITED ${RED}CHROOT${CYN} ENVIRONMENT${RST}...\n"