Changeset 111194c


Ignore:
Timestamp:
09/25/2022 08:57:46 AM (2 months ago)
Author:
Xi Ruoyao <xry111@…>
Branches:
xry111/arm64
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:
3 edited

Legend:

Unmodified
Added
Removed
  • bootscripts/lfs/init.d/swap

    r8f641ee r111194c  
    2121# Default-Start:       S
    2222# Default-Stop:        0 6
    23 # Short-Description:   Mounts and unmounts swap partitions.
    24 # Description:         Mounts and unmounts swap partitions defined in
     23# Short-Description:   Activates and deactivates swap partitions.
     24# Description:         Activates and deactivates swap partitions defined in
    2525#                      /etc/fstab.
    2626# X-LFS-Provided-By:   LFS
  • chapter10/kernel.xml

    r8f641ee r111194c  
    309309
    310310    <caution>
    311       <para>If the host system has a separate /boot partition, the files copied
    312       below should go there. The easiest way to do that is to bind /boot on the
    313       host (outside chroot) to /mnt/lfs/boot before proceeding.  As the
    314       &root; user in the <emphasis>host system</emphasis>:</para>
    315 
    316 <screen role="nodump"><userinput>mount --bind /boot /mnt/lfs/boot</userinput></screen>
     311      <para>If you've decided to use a separate &boot-dir; partition for the
     312      LFS system (maybe sharing a &boot-dir; partition with the host
     313      distro) , the files copied below should go there. The easiest way to
     314      do that is to create the entry for &boot-dir; in &fstab; first (read
     315      the previous section for details), then issue the following command
     316      as the &root; user in the
     317      <emphasis>chroot environment</emphasis>:</para>
     318
     319<screen role="nodump"><userinput>mount /boot</userinput></screen>
     320
     321      <para>The path to the device node is omitted in the command because
     322      <command>mount</command> can read it from &fstab;.</para>
    317323    </caution>
    318324
  • general.ent

    r8f641ee r111194c  
    123123<!ENTITY lfs-user        "<systemitem class='username'>lfs</systemitem>">
    124124<!ENTITY fstab           "<filename>/etc/fstab</filename>">
     125<!ENTITY boot-dir        "<filename class='directory'>/boot</filename>">
    125126
    126127<!ENTITY % packages-entities SYSTEM "packages.ent">
Note: See TracChangeset for help on using the changeset viewer.