Changeset 111194c

Timestamp:

09/25/2022 08:57:46 AM (19 months ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

xry111/arm64, xry111/arm64-12.0

Children:

96323bd

Parents:

8f641ee (diff), f427ba23 (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:

Merge remote-tracking branch 'origin/trunk' into xry111/arm64

Files:

• bootscripts/lfs/init.d/swap (modified) (1 diff)
• chapter10/kernel.xml (modified) (1 diff)
• general.ent (modified) (1 diff)

bootscripts/lfs/init.d/swap

@@ -21 +21 @@
 # Default-Start:       S
 # Default-Stop:        0 6
-# Short-Description:   Mounts and unmounts swap partitions.
-# Description:         Mounts and unmounts swap partitions defined in
+# Short-Description:   Activates and deactivates swap partitions.
+# Description:         Activates and deactivates swap partitions defined in
 #                      /etc/fstab.
 # X-LFS-Provided-By:   LFS

chapter10/kernel.xml

@@ -309 +309 @@
 
     <caution>
-      <para>If the host system has a separate /boot partition, the files copied
-      below should go there. The easiest way to do that is to bind /boot on the
-      host (outside chroot) to /mnt/lfs/boot before proceeding.  As the
-      &root; user in the <emphasis>host system</emphasis>:</para>
-
-<screen role="nodump"><userinput>mount --bind /boot /mnt/lfs/boot</userinput></screen>
+      <para>If you've decided to use a separate &boot-dir; partition for the
+      LFS system (maybe sharing a &boot-dir; partition with the host
+      distro) , the files copied below should go there. The easiest way to
+      do that is to create the entry for &boot-dir; in &fstab; first (read
+      the previous section for details), then issue the following command
+      as the &root; user in the
+      <emphasis>chroot environment</emphasis>:</para>
+
+<screen role="nodump"><userinput>mount /boot</userinput></screen>
+
+      <para>The path to the device node is omitted in the command because
+      <command>mount</command> can read it from &fstab;.</para>
     </caution>
 

general.ent

@@ -123 +123 @@
 <!ENTITY lfs-user        "<systemitem class='username'>lfs</systemitem>">
 <!ENTITY fstab           "<filename>/etc/fstab</filename>">
+<!ENTITY boot-dir        "<filename class='directory'>/boot</filename>">
 
 <!ENTITY % packages-entities SYSTEM "packages.ent">