Changeset b3d94f3

Timestamp:

07/22/2023 10:30:15 PM (10 months ago)

Author:

Thomas Trepl <thomas@…>

Branches:

multilib

Children:

7f440a6

Parents:

9f0c94b (diff), e5c08bf (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/ChangeLog (modified) (1 diff)
• bootscripts/lfs/init.d/mountvirtfs (modified) (2 diffs)
• bootscripts/lfs/init.d/udev (modified) (1 diff)
• chapter01/changelog.xml (modified) (1 diff)
• chapter10/kernel.xml (modified) (1 diff)
• packages.ent (modified) (1 diff)

bootscripts/ChangeLog

@@ +1 @@
+2023-07-22 Xi Ruoyao <xry111@xry111.site>
+   * In mountvirtfs, create symlinks /dev/{fd,std{in,out,err}} and
+     /dev/core (optional).
+
+2023-07-16 Xi Ruoyao <xry111@xry111.site>
+   * In udev, set SYSTEMD_LOG_TARGET=kmsg so systemd-udevd will correctly
+     log messages.
+
 2023-07-15 Xi Ruoyao <xry111@xry111.site>
    * Use /bin/udevadm instead of /sbin/udevadm.

bootscripts/lfs/init.d/mountvirtfs

@@ -8 +8 @@
 #               DJ Lucas - dj@linuxfromscratch.org
 # Update      : Bruce Dubbs - bdubbs@linuxfromscratch.org
+#               Xi Ruoyao - xry111@xry111.site
 #
-# Version     : LFS 7.0
+# Version     : LFS 12.0
 #
 ########################################################################
@@ -65 +66 @@
       (exit ${failed})
       evaluate_retval
+      if [ "${failed}" = 1 ]; then
+         exit 1
+      fi
+
+      log_info_msg "Create symlinks in /dev targeting /proc: ${INFO}/dev/stdin"
+      ln -sf /proc/self/fd/0 /dev/stdin  || failed=1
+
+      log_info_msg2 " ${INFO}/dev/stdout"
+      ln -sf /proc/self/fd/1 /dev/stdout || failed=1
+
+      log_info_msg2 " ${INFO}/dev/stderr"
+      ln -sf /proc/self/fd/2 /dev/stderr || failed=1
+
+      log_info_msg2 " ${INFO}/dev/fd"
+      ln -sf /proc/self/fd   /dev/fd     || failed=1
+
+      if [ -e /proc/kcore ]; then
+         log_info_msg2 " ${INFO}/dev/core"
+         ln -sf /proc/kcore  /dev/core   || failed=1
+      fi
+
+      (exit ${failed})
+      evaluate_retval
       exit $failed
       ;;

bootscripts/lfs/init.d/udev

@@ -8 +8 @@
 #               DJ Lucas - dj@linuxfromscratch.org
 # Update      : Bruce Dubbs - bdubbs@linuxfromscratch.org
+#               Xi Ruoyao - xry111@xry111.site
 #
-# Version     : LFS 7.0
+# Version     : LFS 12.0
 #
 ########################################################################

chapter01/changelog.xml

@@ -41 +41 @@
     -->
 
+    <listitem revision='sysv'>
+      <para>2023-07-22</para>
+      <itemizedlist>
+        <listitem revision='sysv'>
+          <para>[xry111] - Make the mountvirtfs bootscript create essential
+          symlinks in /dev.  Fixes
+          <ulink url='&lfs-ticket-root;5289'>#5289</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2023-07-15</para>

chapter10/kernel.xml

@@ -464 +464 @@
     <para>Install the documentation for the Linux kernel:</para>
 
-<screen><userinput remap="install">install -d /usr/share/doc/linux-&linux-version;
-cp -r Documentation/* /usr/share/doc/linux-&linux-version;</userinput></screen>
+<screen><userinput remap="install">cp -r Documentation -T /usr/share/doc/linux-&linux-version;</userinput></screen>
 
     <para>It is important to note that the files in the kernel source

packages.ent

@@ -393 +393 @@
 <!ENTITY less-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY lfs-bootscripts-version "20230716">      <!-- Scripts depend on this format -->
+<!ENTITY lfs-bootscripts-version "20230722">      <!-- 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">