Changeset acd14bc

Timestamp:

03/23/2022 04:45:10 AM (2 years ago)

Author:

Thomas Trepl (Moody) <thomas@…>

Branches:

multilib

Children:

051c160

Parents:

60093fd (diff), 6ad47308 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Automatic merge of trunk into multilib

Files:

• bootscripts/lfs/init.d/mountvirtfs (modified) (2 diffs)
• chapter10/kernel.xml (modified) (4 diffs)

bootscripts/lfs/init.d/mountvirtfs

@@ -3 +3 @@
 # Begin mountvirtfs
 #
-# Description : Mount proc, sysfs, and run
+# Description : Ensure proc, sysfs, run, and dev are mounted
 #
 # Authors     : Gerard Beekmans - gerard@linuxfromscratch.org
@@ -21 +21 @@
 # Default-Start:       S
 # Default-Stop:
-# Short-Description:   Mounts /sys and /proc virtual (kernel) filesystems.
-#                      Mounts /run (tmpfs) and /dev (devtmpfs).
+# Short-Description:   Mounts various special fs needed at start
 # Description:         Mounts /sys and /proc virtual (kernel) filesystems.
 #                      Mounts /run (tmpfs) and /dev (devtmpfs).
+#                      This is done only if they are not already mounted.
+#                      with the kernel config proposed in the book, dev
+#                      should be automatically mounted by the kernel.
 # X-LFS-Provided-By:   LFS
 ### END INIT INFO

chapter10/kernel.xml

@@ -114 +114 @@
   Generic Driver Options  --->
    [ ] Support for uevent helper [CONFIG_UEVENT_HELPER]
-   [*] Maintain a devtmpfs filesystem to mount at /dev [CONFIG_DEVTMPFS]</screen>
+   [*] Maintain a devtmpfs filesystem to mount at /dev [CONFIG_DEVTMPFS]
+   [*]   Automount devtmpfs at /dev, after the kernel mounted the rootfs [CONFIG_DEVTMPFS_MOUNT]</screen>
 
       <screen role="nodump" revision="systemd">General setup -->
    [ ] Auditing Support [CONFIG_AUDIT]
+   CPU/Task time and stats accounting ---&gt;
+      [*] Pressure stall information tracking [CONFIG_PSI]
    &lt; &gt; Enable kernel headers through /sys/kernel/kheaders.tar.xz [CONFIG_IKHEADERS]
    [*] Control Group support [CONFIG_CGROUPS]   ---&gt;
@@ -124 +127 @@
    [*] Configure standard kernel features (expert users) [CONFIG_EXPERT] ---&gt;
       [*] open by fhandle syscalls [CONFIG_FHANDLE]
-   CPU/Task time and stats accounting ---&gt;
-      [*] Pressure stall information tracking [CONFIG_PSI]
 General architecture-dependent options  ---&gt;
    [*] Enable seccomp to safely compute untrusted bytecode [CONFIG_SECCOMP]
@@ -132 +133 @@
    &lt;*&gt; The IPv6 protocol [CONFIG_IPV6]
 Device Drivers  ---&gt;
+  Generic Driver Options  ---&gt;
+   [ ] Support for uevent helper [CONFIG_UEVENT_HELPER]
+   [*] Maintain a devtmpfs filesystem to mount at /dev [CONFIG_DEVTMPFS]
+   [*]   Automount devtmpfs at /dev, after the kernel mounted the rootfs [CONFIG_DEVTMPFS_MOUNT]
+   Firmware Loader ---&gt;
+      [ ] Enable the firmware sysfs fallback mechanism [CONFIG_FW_LOADER_USER_HELPER]
   Firmware Drivers   ---&gt;
    [*] Export DMI identification via sysfs to userspace [CONFIG_DMIID]
   Graphics support ---&gt;
    Frame buffer Devices ---&gt;
-      [*] Support for frame buffer devices ----
-  Generic Driver Options  ---&gt;
-   [ ] Support for uevent helper [CONFIG_UEVENT_HELPER]
-   [*] Maintain a devtmpfs filesystem to mount at /dev [CONFIG_DEVTMPFS]
-   Firmware Loader ---&gt;
-      [ ] Enable the firmware sysfs fallback mechanism [CONFIG_FW_LOADER_USER_HELPER]
+      &lt;*&gt; Support for frame buffer devices ---&gt;
 File systems  ---&gt;
    [*] Inotify support for userspace [CONFIG_INOTIFY_USER]
-  Pseudo filesystems  ---&gt;
-   [*] Tmpfs POSIX Access Control Lists [CONFIG_TMPFS_POSIX_ACL]</screen>
+       Pseudo filesystems  ---&gt;
+        [*] Tmpfs POSIX Access Control Lists [CONFIG_TMPFS_POSIX_ACL]</screen>
     </note>
 
@@ -232 +234 @@
       </varlistentry>
 
+      <varlistentry>
+        <term><parameter>Automount devtmpfs at /dev</parameter></term>
+        <listitem>
+          <para>This will mount the kernel view of the devices on /dev
+          upon switching to root filesystem just before starting
+          init.</para>
+        </listitem>
+      </varlistentry>
+
     </variablelist>