Author: pierre
Date: Tue Mar 31 01:47:52 2020
New Revision: 4147
Log:
Fix the SHELL for CHROOT target for LFS
We use the filter builtin function of make to retrieve the right
shell to use during the CHROOT phase, which is the same as the
one in CHROOT1.
Also do not assume envars exist when removing it at the beginning
of the SUDO phase.
Modified:
jhalfs/trunk/LFS/master.sh
Modified: jhalfs/trunk/LFS/master.sh
==============================================================================
--- jhalfs/trunk/LFS/master.sh Sun Mar 29 13:35:52 2020 (r4146)
+++ jhalfs/trunk/LFS/master.sh Tue Mar 31 01:47:52 2020 (r4147)
@@ -532,7 +532,7 @@
@touch \$@
mk_SUDO: mk_LUSER
- @sudo rm envars
+ @sudo rm -f envars
@sudo make BREAKPOINT=\$(BREAKPOINT) SUDO
@touch \$@
@@ -603,7 +603,7 @@
fi
(
cat << EOF
-CHROOT: SHELL=/tools/bin/bash
+CHROOT: SHELL=\$(filter %bash,\$(CHROOT1))
CHROOT: $chapter6
BOOT: $chapter78
CUSTOM_TOOLS: $custom_list
--
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page
