1 files changed, 275 insertions, 275 deletions
diff --git a/lfs.sh b/lfs.sh
index 735c9e1..59a3468 100755
--- a/lfs.sh
+++ b/lfs.sh
@@ -1,275 +1,275 @@
-#!/bin/bash
-set -u
-
-clear
-
-printf "%b" "Sourcing colors...\n"
-# Colors defined for text
-source colors.sh
-
-printf "%b" "Sourcing environment variables...\n"
-# LFS build environment settings
-source env.sh
-
-printf "%b" "Sourcing functions...\n"
-# Functions used during build
-source functions.sh
-
-# Version check script
-#source versioncheck.sh
-
-printf "%b" "\n\n\n${CYN}BUILDING ${YLW}${LFS_VER} $(uname -m)${CYN} at \
-${IWHT}${LFS}${CYN} on ${IWHT}${LFS_DISK}${LFS_PART}${RST}\n\n"
-
-printf "%b" "${IRED}*** ${IREDB}WARNING${RST} \
-${IWHT}POTENTIAL DATA LOSS \
-${IREDB}WARNING ${RST}${IRED}***${GRN}\n${RST}"
-
-printf "%b" "${GRN}Automatic creation of partition(s), filesystem(s) \n\
-and mounting will occur unless manually performed\n\
-before continuing.${RST}\n\n\n"
-
-# Continue or Abort
-printf "%b" "${IGRN}CONTINUE ${IWHTB}(C)${RST} / ${IRED}ABORT ${IWHTB}(OTHER)${RST}\n"
-if read -r -n 1 contabort; then
-	if [[ "$contabort" == "C" ]] || [[ "$contabort" == "c" ]]; then
-		printf "%b" "\b${IWHT}Build is "
-		success "CONTINUING\n"
-	else
-		printf "%b" "\b${IWHT}Build "
-		fail "ABORTED!\n"
-		exit 0
-	fi
-else
-	printf "%b" "\b${IWHT}Selection "
-	fail "FAILURE!\n"
-	exit 1
-fi
-
-# Create LFS directory if it doesn't exist
-printf "%b" "${GRN}Creating LFS directory at ${YLW}${LFS}${GRN}${RST}... "
-if [[ -d "${LFS}" ]]; then
-	success "EXISTS"
-else
-	if ! sudo mkdir "${LFS}" >/dev/null 2>&1; then
-		fail "FAILED!"
-		exit 1
-	fi
-fi
-
-# Setup partition, filesystem, format and mount if
-# LFS filesystem is not previously mounted
-if ! grep -q "${LFS}" /proc/mounts; then
-	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}"
-fi
-
-# Create limited directory layout
-if [[ ! -f "${LFS}"/sources/limited ]]; then
-	printf "%b" "  ${IGRN}Changing ownership of ${IWHT}${LFS}${IGRN} \
-to user ${IWHT}${USER}${RST}\n"
-    sudo chown "${USER}" "${LFS}"
-
-	printf "%b" "  ${IGRN}Creating limited directory structure at \
-${IWHT}${LFS}${IGRN}${RST}\n"
-	mkdir -p "${LFS}"/sources
-	mkdir -p "${LFS}"/tools
-	mkdir -p "${LFS}"/bin
-	mkdir -p "${LFS}"/etc
-	mkdir -p "${LFS}"/lib
-	mkdir -p "${LFS}"/sbin
-	mkdir -p "${LFS}"/usr
-	mkdir -p "${LFS}"/var
-	touch "${LFS}"/sources/limited
-fi
-
-case $(uname -m) in
-    x86_64) mkdir -p "${LFS}"/lib64 ;;
-esac
-
-# Will use normal user and not special lfs user
-#sudo groupadd lfs
-#sudo useradd -s /bin/bash -g lfs -m -k /dev/null lfs
-
-#printf "%b" "${LFS_PWD}\n${LFS_PWD}\n" | sudo passwd lfs
-
-# Copy scripts and csv files to LFS sources target
-printf "%b" "${GRN}Copying required files to ${YLW}${LFS}/sources \
-${GRN}target directory${RST}... "
-
-if ! cp -rf ./*.sh chapter* ./*.csv kernelconfig "${LFS}/sources"; then
-	fail "FAILED!"
-else
-	success "OK"
-fi
-
-cd "${LFS}/sources" || exit 1
-
-# Download packages and patches
-printf "%b" "\n${IWHT}============ ${IGRN}Downloading source files and patches \
-${IWHT}============${RST}\n"
-source download.sh
-retval=$?
-if [[ "$retval" -ne 0 ]]; then
-    exit 1
-fi
-
-# Chapter 5
-printf "%b" "\n${IWHT}============ ${IGRN}Building ${IYLW}Chapter 5${IWHT} \
-============${RST}\n"
-for package in binutils gcc linux-api-headers glibc libstdc++; do
-    source packageinstall.sh 5 $package
-    retval=$?
-    if [[ "$retval" -ne 0 ]]; then
-        exit 1
-    fi
-done
-
-# Chapter 6
-printf "%b" "\n${IWHT}============ ${IGRN}Building ${IYLW}Chapter 6${IWHT} \
-============${RST}\n"
-for package in m4 ncurses bash coreutils diffutils file findutils gawk grep gzip make patch sed tar xz binutils gcc; do
-    source packageinstall.sh 6 $package
-    retval=$?
-    if [[ "$retval" -ne 0 ]]; then
-        exit 1
-    fi
-done
-
-printf "%b" "\n${IWHT}======= ${IYLW}Chapter 6 ${IGRN}Cleanup and Backup \
-${IWHT}=======${RST}\n"
-source chapter6/cleanup.sh
-source chapter6/backup.sh
-
-# Prepare chroot scripts to be executable for owner, group and others
-chmod ugo+x preparechroot.sh
-chmod ugo+x insidechroot.sh
-
-printf "%b" "\n${CYN}PREPARING ${RED}CHROOT${CYN} ENVIRONMENT${RST}...\n"
-source preparechroot.sh "${LFS}"
-source createdirs.sh
-source essential.sh
-
-printf "%b" "\n${CYN}ENTERING ${RED}CHROOT${CYN} ENVIRONMENT${RST}...\n"
-sleep 3
-
-# Create chapter7 log directory as non root user
-mkdir -p "${LFS}"/sources/log/chapter7
-
-# Enter CHROOT for chapter 7
-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="${MAKEFLAGS}" \
-	SPINNER="${SPINNER}" \
-	/bin/bash --login +h -c "/sources/insidechroot.sh 7"
-retval=$?
-
-printf "%b" "\n${CYN}EXITED ${RED}CHROOT${RST} ENVIRONMENT...${RST}\n"
-# Cleanup and Backup if chapter 7 successfully finished
-if [[ "$retval" -eq 0 ]]; then
-	source umountvirtfs.sh
-
-	printf "%b" "\n${IWHT}======= ${IYLW}Chapter 7 ${IGRN}Cleanup and Backup \
-${IWHT}=======${RST}\n"
-	# shellcheck source=chapter7/cleanup.sh
-	source "${LFS}"/sources/chapter7/cleanup.sh
-	# shellcheck source=chapter7/backup.sh
-	source "${LFS}"/sources/chapter7/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
-
-# 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\$ ' \
-	PATH=/bin:/usr/bin:/sbin:/usr/sbin \
-	NUMPROCS="${NUMPROCS}" \
-	MAKEFLAGS="${MAKEFLAGS}" \
-	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"
-	# shellcheck source=chapter8/cleanup.sh
-	source "${LFS}"/sources/chapter8/cleanup.sh
-	# shellcheck source=chapter8/backup.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
-
-# Create chapter9 log directory as non root user
-mkdir -p "${LFS}"/sources/log/chapter9
-
-# Enter CHROOT for chapter 9
-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}ENTERING ${RED}CHROOT${CYN} ENVIRONMENT...${RST}\n"
-sleep 3
-
-# Create chapter10 log directory as non root user
-mkdir -p "${LFS}"/sources/log/chapter10
-
-# Enter CHROOT for chapter 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}" \
-	LFS_DISK="${LFS_DISK}" \
-	LFS_PART="${LFS_PART}" \
-	LFS_FS="${LFS_FS}" \
-	LFS_SWAP="${LFS_SWAP}" \
-	/bin/bash --login +h -c "/sources/insidechroot.sh 10"
-retval=$?
-
-printf "%b" "\n${CYN}EXITED ${RED}CHROOT${RST} ENVIRONMENT...${RST}\n"
+#!/bin/bash
+set -u
+
+clear
+
+printf "%b" "Sourcing colors...\n"
+# Colors defined for text
+source colors.sh
+
+printf "%b" "Sourcing environment variables...\n"
+# LFS build environment settings
+source env.sh
+
+printf "%b" "Sourcing functions...\n"
+# Functions used during build
+source functions.sh
+
+# Version check script
+#source versioncheck.sh
+
+printf "%b" "\n\n\n${CYN}BUILDING ${YLW}${LFS_VER} $(uname -m)${CYN} at \
+${IWHT}${LFS}${CYN} on ${IWHT}${LFS_DISK}${LFS_PART}${RST}\n\n"
+
+printf "%b" "${IRED}*** ${IREDB}WARNING${RST} \
+${IWHT}POTENTIAL DATA LOSS \
+${IREDB}WARNING ${RST}${IRED}***${GRN}\n${RST}"
+
+printf "%b" "${GRN}Automatic creation of partition(s), filesystem(s) \n\
+and mounting will occur unless manually performed\n\
+before continuing.${RST}\n\n\n"
+
+# Continue or Abort
+printf "%b" "${IGRN}CONTINUE ${IWHTB}(C)${RST} / ${IRED}ABORT ${IWHTB}(OTHER)${RST}\n"
+if read -r -n 1 contabort; then
+	if [[ "$contabort" == "C" ]] || [[ "$contabort" == "c" ]]; then
+		printf "%b" "\b${IWHT}Build is "
+		success "CONTINUING\n"
+	else
+		printf "%b" "\b${IWHT}Build "
+		fail "ABORTED!\n"
+		exit 0
+	fi
+else
+	printf "%b" "\b${IWHT}Selection "
+	fail "FAILURE!\n"
+	exit 1
+fi
+
+# Create LFS directory if it doesn't exist
+printf "%b" "${GRN}Creating LFS directory at ${YLW}${LFS}${GRN}${RST}... "
+if [[ -d "${LFS}" ]]; then
+	success "EXISTS"
+else
+	if ! sudo mkdir "${LFS}" >/dev/null 2>&1; then
+		fail "FAILED!"
+		exit 1
+	fi
+fi
+
+# Setup partition, filesystem, format and mount if
+# LFS filesystem is not previously mounted
+if ! grep -q "${LFS}" /proc/mounts; then
+	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}"
+fi
+
+# Create limited directory layout
+if [[ ! -f "${LFS}"/sources/limited ]]; then
+	printf "%b" "  ${IGRN}Changing ownership of ${IWHT}${LFS}${IGRN} \
+to user ${IWHT}${USER}${RST}\n"
+    sudo chown "${USER}" "${LFS}"
+
+	printf "%b" "  ${IGRN}Creating limited directory structure at \
+${IWHT}${LFS}${IGRN}${RST}\n"
+	mkdir -p "${LFS}"/sources
+	mkdir -p "${LFS}"/tools
+	mkdir -p "${LFS}"/bin
+	mkdir -p "${LFS}"/etc
+	mkdir -p "${LFS}"/lib
+	mkdir -p "${LFS}"/sbin
+	mkdir -p "${LFS}"/usr
+	mkdir -p "${LFS}"/var
+	touch "${LFS}"/sources/limited
+fi
+
+case $(uname -m) in
+    x86_64) mkdir -p "${LFS}"/lib64 ;;
+esac
+
+# Will use normal user and not special lfs user
+#sudo groupadd lfs
+#sudo useradd -s /bin/bash -g lfs -m -k /dev/null lfs
+
+#printf "%b" "${LFS_PWD}\n${LFS_PWD}\n" | sudo passwd lfs
+
+# Copy scripts and csv files to LFS sources target
+printf "%b" "${GRN}Copying required files to ${YLW}${LFS}/sources \
+${GRN}target directory${RST}... "
+
+if ! cp -rf ./*.sh chapter* ./*.csv kernelconfig "${LFS}/sources"; then
+	fail "FAILED!"
+else
+	success "OK"
+fi
+
+cd "${LFS}/sources" || exit 1
+
+# Download packages and patches
+printf "%b" "\n${IWHT}============ ${IGRN}Downloading source files and patches \
+${IWHT}============${RST}\n"
+source download.sh
+retval=$?
+if [[ "$retval" -ne 0 ]]; then
+    exit 1
+fi
+
+# Chapter 5
+printf "%b" "\n${IWHT}============ ${IGRN}Building ${IYLW}Chapter 5${IWHT} \
+============${RST}\n"
+for package in binutils gcc linux-api-headers glibc libstdc++; do
+    source packageinstall.sh 5 $package
+    retval=$?
+    if [[ "$retval" -ne 0 ]]; then
+        exit 1
+    fi
+done
+
+# Chapter 6
+printf "%b" "\n${IWHT}============ ${IGRN}Building ${IYLW}Chapter 6${IWHT} \
+============${RST}\n"
+for package in m4 ncurses bash coreutils diffutils file findutils gawk grep gzip make patch sed tar xz binutils gcc; do
+    source packageinstall.sh 6 $package
+    retval=$?
+    if [[ "$retval" -ne 0 ]]; then
+        exit 1
+    fi
+done
+
+printf "%b" "\n${IWHT}======= ${IYLW}Chapter 6 ${IGRN}Cleanup and Backup \
+${IWHT}=======${RST}\n"
+source chapter6/cleanup.sh
+source chapter6/backup.sh
+
+# Prepare chroot scripts to be executable for owner, group and others
+chmod ugo+x preparechroot.sh
+chmod ugo+x insidechroot.sh
+
+printf "%b" "\n${CYN}PREPARING ${RED}CHROOT${CYN} ENVIRONMENT${RST}...\n"
+source preparechroot.sh "${LFS}"
+source createdirs.sh
+source essential.sh
+
+printf "%b" "\n${CYN}ENTERING ${RED}CHROOT${CYN} ENVIRONMENT${RST}...\n"
+sleep 3
+
+# Create chapter7 log directory as non root user
+mkdir -p "${LFS}"/sources/log/chapter7
+
+# Enter CHROOT for chapter 7
+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="${MAKEFLAGS}" \
+	SPINNER="${SPINNER}" \
+	/bin/bash --login +h -c "/sources/insidechroot.sh 7"
+retval=$?
+
+printf "%b" "\n${CYN}EXITED ${RED}CHROOT${RST} ENVIRONMENT...${RST}\n"
+# Cleanup and Backup if chapter 7 successfully finished
+if [[ "$retval" -eq 0 ]]; then
+	source umountvirtfs.sh
+
+	printf "%b" "\n${IWHT}======= ${IYLW}Chapter 7 ${IGRN}Cleanup and Backup \
+${IWHT}=======${RST}\n"
+	# shellcheck source=chapter7/cleanup.sh
+	source "${LFS}"/sources/chapter7/cleanup.sh
+	# shellcheck source=chapter7/backup.sh
+	source "${LFS}"/sources/chapter7/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
+
+# 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\$ ' \
+	PATH=/bin:/usr/bin:/sbin:/usr/sbin \
+	NUMPROCS="${NUMPROCS}" \
+	MAKEFLAGS="${MAKEFLAGS}" \
+	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"
+	# shellcheck source=chapter8/cleanup.sh
+	source "${LFS}"/sources/chapter8/cleanup.sh
+	# shellcheck source=chapter8/backup.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
+
+# Create chapter9 log directory as non root user
+mkdir -p "${LFS}"/sources/log/chapter9
+
+# Enter CHROOT for chapter 9
+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}ENTERING ${RED}CHROOT${CYN} ENVIRONMENT...${RST}\n"
+sleep 3
+
+# Create chapter10 log directory as non root user
+mkdir -p "${LFS}"/sources/log/chapter10
+
+# Enter CHROOT for chapter 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}" \
+	LFS_DISK="${LFS_DISK}" \
+	LFS_PART="${LFS_PART}" \
+	LFS_FS="${LFS_FS}" \
+	LFS_SWAP="${LFS_SWAP}" \
+	/bin/bash --login +h -c "/sources/insidechroot.sh 10"
+retval=$?
+
+printf "%b" "\n${CYN}EXITED ${RED}CHROOT${RST} ENVIRONMENT...${RST}\n"