Changeset 262e174 for LFS/master.sh

Timestamp:

10/06/2022 08:39:09 AM (2 years ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

ablfs-more, trunk

Children:

fd90f80

Parents:

3722d31

Message:

systemd: copy /etc/resolv.conf from the host

when entering chroot. This allows using the network in chroot.

File:

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

LFS/master.sh

@@ -294 +294 @@
 all:    ck_UID ck_terminal mk_SETUP mk_LUSER mk_SUDO mk_CHROOT mk_BOOT create-sbu_du-report mk_BLFS_TOOL mk_CUSTOM_TOOLS
         @sudo env LFS=\$(MOUNT_PT) kernfs-scripts/teardown.sh
+EOF
+) >> $MKFILE
+# With systemd, the commands in chapter 9 do not create a
+# valid /etc/resolv.conf, so that if blfs_tools are installed, and
+# make-ca is run, it cannot connect. In this case, resolv.conf
+# from the host has been copied, and we need to remove it now.
+if [ "$INITSYS" = systemd ]; then
+(
+    cat << EOF
+        @sudo rm -v \$(MOUNT_PT)/etc/resolv.conf
+EOF
+) >> $MKFILE
+fi
+(
+    cat << EOF
         @sudo make do_housekeeping
         @echo $VERSION > lfs-release && \\
@@ -381 +396 @@
 EOF
 ) >> $MKFILE
+# With systemd, the commands in chapter 9 do not create a
+# valid /etc/resolv.conf, so that if we want to enter chroot,
+# and systemd has not yet been run (otherwise /etc/resolv.conf
+# exists), we just copy resolv.conf from the host.
 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
+        if ! [ -e \$(MOUNT_PT)/etc/resolv.conf ]; then \\
+          sudo cp -v /etc/resolv.conf \$(MOUNT_PT)/etc; \\
+          sudo touch \$(MOUNT_PT)/etc/.host-resolvconf; \\
+        fi
 EOF
 ) >> $MKFILE
@@ -394 +415 @@
 teardown:
         sudo env LFS=\$(MOUNT_PT) kernfs-scripts/teardown.sh
+EOF
+) >> $MKFILE
+# With systemd, the commands in chapter 9 do not create a
+# valid /etc/resolv.conf, so that if we want to enter chroot,
+# and systemd has not yet been run (otherwise /etc/resolv.conf
+# exists), we just copy resolv.conf from the host.
+# We need to remove it now, if it has been created.
+if [ "$INITSYS" = systemd ]; then
+(
+    cat << EOF
+        if [ -e \$(MOUNT_PT)/etc/.host-resolvconf ]; then \\
+          sudo rm -v \$(MOUNT_PT)/etc/resolv.conf; \\
+          sudo rm -v \$(MOUNT_PT)/etc/.host-resolvconf; \\
+        fi
+EOF
+) >> $MKFILE
+fi
+(
+    cat << EOF
 
 chroot1: devices
@@ -408 +448 @@
 EOF
 ) >> $MKFILE
+# With systemd, the commands in chapter 9 do not create a
+# valid /etc/resolv.conf, so that if blfs_tools are installed, and
+# make-ca is run, it cannot connect. We just copy resolv.conf
+# from the host. We'll remove it at the end.
 if [ "$INITSYS" = systemd ]; then
 (
     cat << EOF
-        mkdir -pv \$(MOUNT_PT)/run/systemd/resolve
-        cp -v /etc/resolv.conf \$(MOUNT_PT)/run/systemd/resolve
+        @cp -v /etc/resolv.conf \$(MOUNT_PT)/etc
 
 EOF