From b5a6b72fc21d9f54b626cc8be5536b179125efd4 Mon Sep 17 00:00:00 2001
From: William Harrington <kb0iic@berzerkula.org>
Date: Thu, 1 Apr 2021 15:39:20 -0500
Subject: Add SPINNER to chroot variables for spinnertype to be used.

---
 lfs.sh | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'lfs.sh')

diff --git a/lfs.sh b/lfs.sh
index 0dea3a0..e31460a 100755
--- a/lfs.sh
+++ b/lfs.sh
@@ -125,10 +125,10 @@ source chapter6/backup.sh
 chmod ugo+x preparechroot.sh
 chmod ugo+x insidechroot.sh
 
-printf "%b" "${CYN}PREPARING ${RED}CHROOT${CYN} ENVIRONMENT...${RST}\n"
+printf "%b" "\n${CYN}PREPARING ${RED}CHROOT${CYN} ENVIRONMENT...${RST}\n"
 sudo ./preparechroot.sh "${LFS}"
 
-printf "%b" "${CYN}ENTERING ${RED}CHROOT${CYN} ENVIRONMENT...${RST}\n"
+printf "%b" "\n${CYN}ENTERING ${RED}CHROOT${CYN} ENVIRONMENT...${RST}\n"
 sleep 3
 
 sudo chroot "${LFS}" /usr/bin/env \
@@ -138,11 +138,12 @@ sudo chroot "${LFS}" /usr/bin/env \
 	PATH=/bin:/usr/bin:/sbin:/usr/sbin \
 	NUMPROCS="${NUMPROCS}" \
 	MAKEFLAGS="${MAKEFLAGS}" \
+	SPINNER="${SPINNER}" \
 	TESTERUID="$(id -u)" \
 	/bin/bash --login +h -c "/sources/insidechroot.sh 7"
 retval=$?
 
-printf "%b" "${CYN}EXITED ${RED}CHROOT${RST} ENVIRONMENT...${RST}\n"
+printf "%b" "\n${CYN}EXITED ${RED}CHROOT${RST} ENVIRONMENT...${RST}\n"
 # Cleanup and Backup if chapter 7 successfully finished
 if [ "$retval" -eq 7 ]; then
 	printf "%b" "${GRN}Unmounting Virtual Kernel Filesystems...\n"
@@ -162,6 +163,9 @@ 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 8, 9 and 10
 sudo chroot "${LFS}" /usr/bin/env \
 	HOME=/root \
@@ -170,7 +174,8 @@ sudo chroot "${LFS}" /usr/bin/env \
 	PATH=/bin:/usr/bin:/sbin:/usr/sbin \
 	NUMPROCS="${NUMPROCS}" \
 	MAKEFLAGS="${MAKEFLAGS}" \
+	SPINNER="${SPINNER}" \
 	TESTERUID="$(id -u)" \
 	/bin/bash --login +h -c "/sources/insidechroot.sh 8"
 
-printf "%b" "${CYN}EXITED ${RED}CHROOT${RST} ENVIRONMENT...${RST}\n"
+printf "%b" "\n${CYN}EXITED ${RED}CHROOT${RST} ENVIRONMENT...${RST}\n"
-- 
cgit v1.2.3-54-g00ecf