Changeset d39252b for LFS

Timestamp:

03/09/2019 07:15:41 AM (5 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

ablfs-more, legacy, trunk

Children:

5af9ab4

Parents:

399058f

Message:

LFS: Copy /etc/resolv.conf to where it should be during chroot, for
systemd: this allows using the network in chroot.
Also add a chroot1 target, and update the teardown target to what is
in the book.

File:

• LFS/master.sh (modified) (1 diff)

LFS/master.sh

@@ -542 +542 @@
           sudo mkdir -p \$(MOUNT_PT)/\$\$(readlink \$(MOUNT_PT)/dev/shm); \\
         fi
-
+EOF
+) >> $MKFILE
+if [ "$INITSYS" = systemd ]; then
+(
+    cat << EOF
+        sudo mkdir -pv \$(MOUNT_PT)/run/systemd/resolve
+        sudo cp -v /etc/resolv.conf \$(MOUNT_PT)}/run/systemd/resolve
+EOF
+) >> $MKFILE
+fi
+(
+    cat << EOF
 teardown:
+        sudo umount -v \$(MOUNT_PT)/dev/pts
+        sudo umount -v \$(MOUNT_PT)/dev
+        sudo umount -v \$(MOUNT_PT)/run
+        sudo umount -v \$(MOUNT_PT)/proc
         sudo umount -v \$(MOUNT_PT)/sys
-        sudo umount -v \$(MOUNT_PT)/proc
-        sudo umount -v \$(MOUNT_PT)/dev/pts
-        if mountpoint -q \$(MOUNT_PT)/run; then \\
-          sudo umount -v \$(MOUNT_PT)/run; \\
-        elif [ -h \$(MOUNT_PT)/dev/shm ]; then \\
-          link=\$\$(readlink \$(MOUNT_PT)/dev/shm); \\
-          sudo umount -v \$(MOUNT_PT)/\$\$link; \\
-          unset link; \\
-        else \\
-          sudo umount -v \$(MOUNT_PT)/dev/shm; \\
-        fi
-        sudo umount -v \$(MOUNT_PT)/dev
+
+chroot1: devices
+        sudo \$(CHROOT1)
+        \$(MAKE) teardown
 
 chroot: devices