Changeset a73ed74

Timestamp:

03/31/2020 08:47:52 AM (4 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

ablfs-more, legacy, trunk

Children:

0835a10

Parents:

a2b5689

Message:

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.

File:

• LFS/master.sh (modified) (2 diffs)

LFS/master.sh

@@ -533 +533 @@
 
 mk_SUDO: mk_LUSER
-        @sudo rm envars
+        @sudo rm -f envars
         @sudo make BREAKPOINT=\$(BREAKPOINT) SUDO
         @touch \$@
@@ -604 +604 @@
 (
     cat << EOF
-CHROOT:       SHELL=/tools/bin/bash
+CHROOT:       SHELL=\$(filter %bash,\$(CHROOT1))
 CHROOT:       $chapter6
 BOOT:         $chapter78