gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-03-09 23:49:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Xi Ruoyao 2022-09-25 16:57:46 +08:00
commit 111194c5b7
No known key found for this signature in database
GPG Key ID: ACAAD20E19E710E3
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bootscripts/lfs/init.d/swap
View File

@ -20,8 +20,8 @@
# Should-Stop: $local_fs # Should-Stop: $local_fs
# Default-Start: S # Default-Start: S
# Default-Stop: 0 6 # Default-Stop: 0 6
# Short-Description: Mounts and unmounts swap partitions. # Short-Description: Activates and deactivates swap partitions.
# Description: Mounts and unmounts swap partitions defined in # Description: Activates and deactivates swap partitions defined in
# /etc/fstab. # /etc/fstab.
# X-LFS-Provided-By: LFS # X-LFS-Provided-By: LFS
### END INIT INFO ### END INIT INFO

16
chapter10/kernel.xml
View File

@ -308,12 +308,18 @@ File systems --->
the <filename class="directory">/boot</filename> directory.</para> the <filename class="directory">/boot</filename> directory.</para>
<caution> <caution>
<para>If the host system has a separate /boot partition, the files copied <para>If you've decided to use a separate &boot-dir; partition for the
below should go there. The easiest way to do that is to bind /boot on the LFS system (maybe sharing a &boot-dir; partition with the host
host (outside chroot) to /mnt/lfs/boot before proceeding. As the distro) , the files copied below should go there. The easiest way to
&root; user in the <emphasis>host system</emphasis>:</para> 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 --bind /boot /mnt/lfs/boot</userinput></screen> <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> </caution>
<para>The path to the kernel image may vary depending on the platform being <para>The path to the kernel image may vary depending on the platform being

1
general.ent
View File

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