Changeset 16cd0963

Timestamp:

09/20/2022 05:20:58 PM (19 months ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, bdubbs/gcc13, multilib, renodr/libudev-from-systemd, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

ab29298

Parents:

cc8e57d

Message:

Adjust instructions for /dev/shm when creating virtual filesystems.
Some host create /dev/shm as a tmpfs. Some have is as
a symlink to a location in another directory. This
change handles both cases.

The change to the sysV bootscripts now creates /dev/shm
as a separate tmpfs from /run. This makes LFS sysV and
systemd versions treat /dev/shm the same.

Files:

• bootscripts/ChangeLog (modified) (1 diff)
• bootscripts/lfs/init.d/mountvirtfs (modified) (2 diffs)
• chapter01/changelog.xml (modified) (1 diff)
• chapter07/cleanup.xml (modified) (1 diff)
• chapter07/kernfs.xml (modified) (1 diff)
• chapter10/fstab.xml (modified) (1 diff)
• chapter11/afterlfs.xml (modified) (1 diff)
• packages.ent (modified) (1 diff)

bootscripts/ChangeLog

@@ +1 @@
+2022-09-30 Bruce Dubbs <bdubbs@linuxfromscratch.org>
+   * Mount /dev/shm as a tmpfs.
+
 2022-07-23 Thomas Trepl <thomas@linuxfromscratch.org>
    * Mark an raid array clean when root (/) has been remounted

bootscripts/lfs/init.d/mountvirtfs

@@ -39 +39 @@
       fi
 
-      mkdir -p /run/lock /run/shm
-      chmod 1777 /run/shm /run/lock
+      mkdir -p   /run/lock 
+      chmod 1777 /run/lock
 
       log_info_msg "Mounting virtual file systems: ${INFO}/run"
@@ -59 +59 @@
       fi
 
-      ln -sfn /run/shm /dev/shm
+      mkdir -p /dev/shm
+      log_info_msg2 " ${INFO}/dev/shm"
+      mount -o nosuid,nodev /dev/shm || failed=1
 
       (exit ${failed})

chapter01/changelog.xml

@@ -40 +40 @@
     appropriate for the entry or if needed the entire day's listitem.
     -->
+
+    <listitem>
+      <para>2022-09-20</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Adappt instructions depending on 
+          host setup of /dev/shm when creating virtual filesystems
+          for chroot.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>

chapter07/cleanup.xml

@@ -96 +96 @@
     <para>Before making a backup, unmount the virtual file systems:</para>
 
-<screen role="nodump"><userinput>umount $LFS/dev/pts
+<screen role="nodump"><userinput>[ mountpoint -q $LFS/dev/shm ] &amp;&amp; umount $LFS/dev/shm
+umount $LFS/dev/pts
 umount $LFS/{sys,proc,run,dev}</userinput></screen>
 

chapter07/kernfs.xml

@@ -90 +90 @@
       directory needs to be created.</para>
 
+      <para>In other cases <filename>/dev/shm</filename> is a mountpoint 
+      for a tmpfs. In that case the mount of /dev above will only create
+      /dev/shm in the chroot environment as a directory. In this situation
+      we explicitly mount a tmpfs,</para>
+
 <screen><userinput>if [ -h $LFS/dev/shm ]; then
   mkdir -pv $LFS/$(readlink $LFS/dev/shm)
+else
+  mount -t tmpfs -o nosuid,nodev tmpfs $LFS/dev/shm
 fi</userinput></screen>
 

chapter10/fstab.xml

@@ -33 +33 @@
 tmpfs          /run         tmpfs    defaults            0     0
 devtmpfs       /dev         devtmpfs mode=0755,nosuid    0     0
+tmpfs          /dev/shm     tmpfs    nosuid,nodev        0     0
 
 # End /etc/fstab</literal>

chapter11/afterlfs.xml

@@ -130 +130 @@
 mounttype sys     sysfs  sysfs
 mounttype run     tmpfs  run
-mkdir $LFS/run/shm
+if [ -h $LFS/dev/shm ]; then
+  mkdir -pv $LFS/$(readlink $LFS/dev/shm)
+else
+  mounttype dev/shm tmpfs tmpfs -o nosuid,nodev
+fi 
+
 #mountbind usr/src
 #mountbind boot

packages.ent

@@ -383 +383 @@
 <!ENTITY less-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY lfs-bootscripts-version "20220723">      <!-- Scripts depend on this format -->
+<!ENTITY lfs-bootscripts-version "20220920">      <!-- Scripts depend on this format -->
 <!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB">
 <!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.xz">