From c4d21647ad45b36097ca225f3952dd6f0628edb0 Mon Sep 17 00:00:00 2001
From: oddlama <oddlama@oddlama.org>
Date: Fri, 3 Jan 2020 00:42:31 +0100
Subject: [PATCH] Close fd 3 when disabling logging

---
 scripts/functions.sh |  6 ++++++
 scripts/main.sh      | 13 ++++---------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/scripts/functions.sh b/scripts/functions.sh
index 19f6eaf..248dae3 100644
--- a/scripts/functions.sh
+++ b/scripts/functions.sh
@@ -263,7 +263,10 @@ extract_stage3() {
 
 disable_logging() {
 	# Disables logging which is needed before exec-ing
+	# Restore stdion
 	exec 1>&3
+	# Close fd 3
+	exec 3<&-
 }
 
 gentoo_umount() {
@@ -274,6 +277,9 @@ gentoo_umount() {
 	fi
 }
 
+interactive_bash() {
+}
+
 gentoo_chroot() {
 	if [[ $# -eq 0 ]]; then
 		cat > "$TMP_DIR/.bashrc" <<EOF
diff --git a/scripts/main.sh b/scripts/main.sh
index 70ae786..5cd5496 100755
--- a/scripts/main.sh
+++ b/scripts/main.sh
@@ -81,24 +81,19 @@ main_install_gentoo_in_chroot() {
 	#install_ansible
 
 	einfo "Gentoo installation complete"
-	einfo "Dropping into chrooted shell"
-	su
+	einfo "To chroot into the new system, simply execute the provided 'chroot' wrapper"
 }
 
 main_install() {
 	[[ $# == 0 ]] || die "Too many arguments"
 
 	gentoo_umount
-	install_stage3 \
-		|| die "Failed to install stage3"
-
-	gentoo_chroot "$GENTOO_BOOTSTRAP_BIND/scripts/main.sh" install_gentoo_in_chroot \
-		|| die "Failed to install gentoo in chroot"
+	install_stage3
+	gentoo_chroot "$GENTOO_BOOTSTRAP_BIND/scripts/main.sh" install_gentoo_in_chroot
 }
 
 main_chroot() {
-	gentoo_chroot "$@" \
-		|| die "Failed to execute script in chroot"
+	gentoo_chroot "$@"
 }
 
 main_umount() {