Merge branch 'trunk' into xry111/clfs-ng

This commit is contained in:
Xi Ruoyao 2022-03-24 00:24:57 +08:00
commit 0000f2618f
No known key found for this signature in database
GPG Key ID: D95E4716CCBB34DC
2 changed files with 27 additions and 14 deletions

View File

@ -2,7 +2,7 @@
######################################################################## ########################################################################
# Begin mountvirtfs # Begin mountvirtfs
# #
# Description : Mount proc, sysfs, and run # Description : Ensure proc, sysfs, run, and dev are mounted
# #
# Authors : Gerard Beekmans - gerard@linuxfromscratch.org # Authors : Gerard Beekmans - gerard@linuxfromscratch.org
# DJ Lucas - dj@linuxfromscratch.org # DJ Lucas - dj@linuxfromscratch.org
@ -20,10 +20,12 @@
# Should-Stop: # Should-Stop:
# Default-Start: S # Default-Start: S
# Default-Stop: # Default-Stop:
# Short-Description: Mounts /sys and /proc virtual (kernel) filesystems. # Short-Description: Mounts various special fs needed at start
# Mounts /run (tmpfs) and /dev (devtmpfs).
# Description: Mounts /sys and /proc virtual (kernel) filesystems. # Description: Mounts /sys and /proc virtual (kernel) filesystems.
# Mounts /run (tmpfs) and /dev (devtmpfs). # 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 # X-LFS-Provided-By: LFS
### END INIT INFO ### END INIT INFO

View File

@ -113,38 +113,40 @@ Device Drivers --->
[*] Support for frame buffer devices ---- [*] Support for frame buffer devices ----
Generic Driver Options ---> Generic Driver Options --->
[ ] Support for uevent helper [CONFIG_UEVENT_HELPER] [ ] 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 --> <screen role="nodump" revision="systemd">General setup -->
[ ] Auditing Support [CONFIG_AUDIT] [ ] 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] &lt; &gt; Enable kernel headers through /sys/kernel/kheaders.tar.xz [CONFIG_IKHEADERS]
[*] Control Group support [CONFIG_CGROUPS] ---&gt; [*] Control Group support [CONFIG_CGROUPS] ---&gt;
[*] Memory controller [CONFIG_MEMCG] [*] Memory controller [CONFIG_MEMCG]
[ ] Enable deprecated sysfs features to support old userspace tools [CONFIG_SYSFS_DEPRECATED] [ ] Enable deprecated sysfs features to support old userspace tools [CONFIG_SYSFS_DEPRECATED]
[*] Configure standard kernel features (expert users) [CONFIG_EXPERT] ---&gt; [*] Configure standard kernel features (expert users) [CONFIG_EXPERT] ---&gt;
[*] open by fhandle syscalls [CONFIG_FHANDLE] [*] open by fhandle syscalls [CONFIG_FHANDLE]
CPU/Task time and stats accounting ---&gt;
[*] Pressure stall information tracking [CONFIG_PSI]
General architecture-dependent options ---&gt; General architecture-dependent options ---&gt;
[*] Enable seccomp to safely compute untrusted bytecode [CONFIG_SECCOMP] [*] Enable seccomp to safely compute untrusted bytecode [CONFIG_SECCOMP]
Networking support ---&gt; Networking support ---&gt;
Networking options ---&gt; Networking options ---&gt;
&lt;*&gt; The IPv6 protocol [CONFIG_IPV6] &lt;*&gt; The IPv6 protocol [CONFIG_IPV6]
Device Drivers ---&gt; 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; Firmware Drivers ---&gt;
[*] Export DMI identification via sysfs to userspace [CONFIG_DMIID] [*] Export DMI identification via sysfs to userspace [CONFIG_DMIID]
Graphics support ---&gt; Graphics support ---&gt;
Frame buffer Devices ---&gt; Frame buffer Devices ---&gt;
[*] Support for frame buffer devices ---- &lt;*&gt; Support for frame buffer devices ---&gt;
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]
File systems ---&gt; File systems ---&gt;
[*] Inotify support for userspace [CONFIG_INOTIFY_USER] [*] Inotify support for userspace [CONFIG_INOTIFY_USER]
Pseudo filesystems ---&gt; Pseudo filesystems ---&gt;
[*] Tmpfs POSIX Access Control Lists [CONFIG_TMPFS_POSIX_ACL]</screen> [*] Tmpfs POSIX Access Control Lists [CONFIG_TMPFS_POSIX_ACL]</screen>
</note> </note>
<note revision="systemd"> <note revision="systemd">
@ -199,6 +201,15 @@ File systems ---&gt;
</listitem> </listitem>
</varlistentry> </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> </variablelist>
<para>Alternatively, <command>make oldconfig</command> may be more <para>Alternatively, <command>make oldconfig</command> may be more