Changeset 13c475b

Timestamp:

03/13/2019 06:31:55 AM (5 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

ablfs-more, legacy, trunk

Children:

a659e46

Parents:

49ba78d

Message:

Get virtual kernel filesystem commands from the book, and really add
/run/systemd/resolve/resolv.conf after creating the kernel FS in chapter 6

Files:

• LFS/master.sh (modified) (7 diffs)
• common/kernfs.xsl (added)
• common/libs/func_book_parser (modified) (3 diffs)
• jhalfs (modified) (1 diff)

LFS/master.sh

@@ -446 +446 @@
   done
 
+  # Store virtual kernel file systems commands:
+  devices=`cat ../kernfs-scripts/devices.sh | \
+            sed -e 's|^|        |'   \
+                -e 's|mount|sudo &|' \
+                -e 's|mkdir|sudo &|' \
+                -e 's|\\$|&&|g' \
+                -e 's|\$\$LFS|$(MOUNT_PT)|g'`
+  teardown=`cat ../kernfs-scripts/teardown.sh | \
+            sed -e 's|^|        |'   \
+                -e 's|umount|sudo &|' \
+                -e 's|\$LFS|$(MOUNT_PT)|'`
+  teardownat=`cat ../kernfs-scripts/teardown.sh | \
+              sed -e 's|^|      |'   \
+                  -e 's|umount|@-sudo &|' \
+                  -e 's|\$LFS|$(MOUNT_PT)|'`
+#echo [DEBUG]
+#echo devices=$devices
+#echo teardown=$teardown
+#echo teardownat=$teardownat
   # Drop in the main target 'all:' and the chapter targets with each sub-target
   # as a dependency.
@@ -452 +471 @@
 
 all:    ck_UID mk_SETUP mk_LUSER mk_SUDO mk_CHROOT mk_BOOT create-sbu_du-report mk_BLFS_TOOL mk_CUSTOM_TOOLS
+$teardownat
         @sudo make do_housekeeping
 EOF
@@ -534 +554 @@
 
 devices: ck_UID
-        sudo mount -v --bind /dev \$(MOUNT_PT)/dev
-        sudo mount -vt devpts devpts \$(MOUNT_PT)/dev/pts
-        sudo mount -vt proc proc \$(MOUNT_PT)/proc
-        sudo mount -vt sysfs sysfs \$(MOUNT_PT)/sys
-        sudo mount -vt tmpfs tmpfs \$(MOUNT_PT)/run
-        if [ -h \$(MOUNT_PT)/dev/shm ]; then \\
-          sudo mkdir -p \$(MOUNT_PT)/\$\$(readlink \$(MOUNT_PT)/dev/shm); \\
-        fi
+$devices
 EOF
 ) >> $MKFILE
@@ -554 +567 @@
 (
     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
+$teardown
 
 chroot1: devices
@@ -572 +582 @@
 LUSER:        $chapter5
 SUDO:         $runasroot
+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
 CHROOT:       SHELL=/tools/bin/bash
 CHROOT:       $chapter6
@@ -598 +621 @@
 
 do_housekeeping:
-        @-umount \$(MOUNT_PT)/sys
-        @-umount \$(MOUNT_PT)/proc
-        @-if mountpoint -q \$(MOUNT_PT)/run; then \\
-          umount \$(MOUNT_PT)/run; \\
-        elif [ -h \$(MOUNT_PT)/dev/shm ]; then \\
-          link=\$\$(readlink \$(MOUNT_PT)/dev/shm); \\
-          umount \$(MOUNT_PT)/\$\$link; \\
-          unset link; \\
-        else \\
-          umount \$(MOUNT_PT)/dev/shm; \\
-        fi
-        @-umount \$(MOUNT_PT)/dev/pts
-        @-umount \$(MOUNT_PT)/dev
         @-rm /tools
         @-if [ ! -f luser-exist ]; then \\
@@ -616 +626 @@
                 rm -rf \$(LUSER_HOME); \\
         fi;
-
 
 EOF

common/libs/func_book_parser

@@ -212 +212 @@
   # Create the packages file. We need it for proper Makefile creation
   create_package_list
-  create_chroot_scripts
+  if [ "${PROGNAME}" = lfs ]; then
+    create_chroot_scripts
+    create_kernfs_scripts
+  fi
 
   # Done. Moving on...
@@ -259 +262 @@
 
 #----------------------------#
-create_chroot_scripts() {      #
-#----------------------------#
-
-  rm -rf chroot_scripts
+create_chroot_scripts() {    #
+#----------------------------#
+
+  rm -rf chroot-scripts
   echo -n "Creating chroot commands scripts from $BOOK"
   if [ ! -z $ARCH ] ; then echo -n " $ARCH" ; fi
@@ -287 +290 @@
 
 }
+
+#----------------------------#
+create_kernfs_scripts() {    #
+#----------------------------#
+
+  rm -rf kernfs-scripts
+  mkdir kernfs-scripts
+  echo -n "Creating virtual kernel FS commands scripts from $BOOK"
+  if [ ! -z $ARCH ] ; then echo -n " $ARCH" ; fi
+  echo -n "... "
+  case ${PROGNAME} in
+    clfs*)
+      xsltproc --nonet --xinclude \
+               -o kernfs-scripts/ kernfs.xsl \
+               $BOOK/BOOK/${ARCH}-index.xml >> $LOGDIR/$LOG 2>&1
+      ;;
+    hlfs)
+      xsltproc --nonet --xinclude \
+               -o kernfs-scripts/ kernfs.xsl \
+               $BOOK/index.xml >> $LOGDIR/$LOG 2>&1
+      ;;
+    lfs)
+      xsltproc --nonet \
+               -o kernfs-scripts/devices.sh kernfs.xsl \
+               $BOOK/chapter06/kernfs.xml >> $LOGDIR/$LOG 2>&1
+      xsltproc --nonet \
+               -o kernfs-scripts/teardown.sh kernfs.xsl \
+               $BOOK/chapter09/reboot.xml >> $LOGDIR/$LOG 2>&1
+      ;;
+    *)
+  esac
+  echo "done"
+
+}

jhalfs

@@ -382 +382 @@
 
 # Copy needed stylesheets
-  cp $COMMON_DIR/{packages.xsl,chroot.xsl} $JHALFSDIR/
+  cp $COMMON_DIR/{packages.xsl,chroot.xsl,kernfs.xsl} $JHALFSDIR/
 
 # Fix the XSL book parser