Changeset 807b061

Timestamp:

02/03/2024 11:30:18 PM (8 months ago)

Author:

Thomas Trepl <thomas@…>

Branches:

multilib, xry111/multilib

Children:

ce6d8f6

Parents:

5569a3e (diff), 8cf42d4 (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:

• chapter07/kernfs.xml (modified) (2 diffs)
• chapter08/glibc.xml (modified) (1 diff)
• chapter11/afterlfs.xml (modified) (1 diff)

chapter07/kernfs.xml

@@ -98 +98 @@
 -->
       <para>In some host systems, <filename>/dev/shm</filename> is a
-      symbolic link to <filename class="directory">/run/shm</filename>.
+      symbolic link to a directory, typically
+      <filename class="directory">/run/shm</filename>.
       The /run tmpfs was mounted above so in this case only a
       directory needs to be created.</para>
@@ -108 +109 @@
 
 <screen><userinput>if [ -h $LFS/dev/shm ]; then
-  (cd $LFS/dev; mkdir $(readlink shm))
+  mkdir -pv $LFS$(realpath /dev/shm)
 else
   mount -vt tmpfs -o nosuid,nodev tmpfs $LFS/dev/shm

chapter08/glibc.xml

@@ -317 +317 @@
 
       <para>
-        Then continue to run the <command>make install</command> command
-        and the <command>sed</command> command against
-        <filename>/usr/bin/ldd</filename>.  Once they are finished, reboot
-        the system immediately.
+        Then continue to run the <command>make install</command> command,
+        the <command>sed</command> command against
+        <filename>/usr/bin/ldd</filename>, and the commands to install
+        the locales.  Once they are finished, reboot the system
+        immediately.
       </para>
     </important>

chapter11/afterlfs.xml

@@ -131 +131 @@
 mounttype run     tmpfs  run
 if [ -h $LFS/dev/shm ]; then
-  mkdir -pv $LFS/$(readlink $LFS/dev/shm)
+  mkdir -pv $LFS$(realpath /dev/shm)
 else
   mounttype dev/shm tmpfs tmpfs -o nosuid,nodev