manuel
/
gentoo-install
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Close fd 3 when disabling logging

This commit is contained in:
oddlama 2020-01-03 00:42:31 +01:00
parent 4df94e6c3d
commit c4d21647ad
No known key found for this signature in database
GPG Key ID: 88EA325D51D53908
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/functions.sh
View File

@ -263,7 +263,10 @@ extract_stage3() {
disable_logging() { disable_logging() {
# Disables logging which is needed before exec-ing # Disables logging which is needed before exec-ing
# Restore stdion
exec 1>&3 exec 1>&3
# Close fd 3
exec 3<&-
} }
gentoo_umount() { gentoo_umount() {
@ -274,6 +277,9 @@ gentoo_umount() {
fi fi
} }
interactive_bash() {
}
gentoo_chroot() { gentoo_chroot() {
if [[ $# -eq 0 ]]; then if [[ $# -eq 0 ]]; then
cat > "$TMP_DIR/.bashrc" <<EOF cat > "$TMP_DIR/.bashrc" <<EOF

13
scripts/main.sh
View File

@ -81,24 +81,19 @@ main_install_gentoo_in_chroot() {
#install_ansible #install_ansible
einfo "Gentoo installation complete" einfo "Gentoo installation complete"
einfo "Dropping into chrooted shell" einfo "To chroot into the new system, simply execute the provided 'chroot' wrapper"
su
} }
main_install() { main_install() {
[[ $# == 0 ]] || die "Too many arguments" [[ $# == 0 ]] || die "Too many arguments"
gentoo_umount gentoo_umount
install_stage3 \ install_stage3
|| die "Failed to install stage3" gentoo_chroot "$GENTOO_BOOTSTRAP_BIND/scripts/main.sh" install_gentoo_in_chroot
gentoo_chroot "$GENTOO_BOOTSTRAP_BIND/scripts/main.sh" install_gentoo_in_chroot \
|| die "Failed to install gentoo in chroot"
} }
main_chroot() { main_chroot() {
gentoo_chroot "$@" \ gentoo_chroot "$@"
|| die "Failed to execute script in chroot"
} }
main_umount() { main_umount() {