gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-06-19 03:39:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove merge conflicts marks in chapter07/cleanup.xml

Browse Source
This commit is contained in:
Pierre Labastie 2021-09-07 23:25:03 +02:00
parent 3781c69cbc
commit 9ee05b53be
1 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
chapter07/cleanup.xml
View File

@ -105,15 +105,9 @@ umount $LFS/{sys,proc,run,dev}</userinput></screen>
</para> </para>
<para> <para>
<<<<<<< HEAD
Make sure you have at least 1 GB free disk space (the source tarballs
will be included in the backup archive) in the home directory of user
<systemitem class="username">root</systemitem>.
=======
Note that the instructions below specify the home directory of the host Note that the instructions below specify the home directory of the host
system's <systemitem class="username">root</systemitem> user, which is system's <systemitem class="username">root</systemitem> user, which is
typically found on the root filesystem. typically found on the root filesystem.
>>>>>>> 8e6babecd0d75542a01eedfde32556879733f842
</para> </para>
<para> <para>
@ -131,14 +125,6 @@ umount $LFS/{sys,proc,run,dev}</userinput></screen>
Because the backup archive is compressed, it takes a relatively Because the backup archive is compressed, it takes a relatively
long time (over 10 minutes) even on a resonably fast system. long time (over 10 minutes) even on a resonably fast system.
</para> </para>
<<<<<<< HEAD
<para>
Also, ensure the <envar>LFS</envar> environment variable is set
for the root user.
</para>
=======
>>>>>>> 8e6babecd0d75542a01eedfde32556879733f842
</note> </note>
<screen role="nodump" revision="sysv"><userinput>cd $LFS <screen role="nodump" revision="sysv"><userinput>cd $LFS
@ -147,14 +133,6 @@ tar -cJpf $HOME/lfs-temp-tools-&version;.tar.xz .</userinput></screen>
<screen role="nodump" revision="systemd"><userinput>cd $LFS <screen role="nodump" revision="systemd"><userinput>cd $LFS
tar -cJpf $HOME/lfs-temp-tools-&versiond;.tar.xz .</userinput></screen> tar -cJpf $HOME/lfs-temp-tools-&versiond;.tar.xz .</userinput></screen>
<<<<<<< HEAD
<para>
Replace <envar>$HOME</envar> by a directory of your choice if you
do not want to have the backup stored in <systemitem
class="username">root</systemitem>'s home directory.
</para>
=======
>>>>>>> 8e6babecd0d75542a01eedfde32556879733f842
</sect2> </sect2>
<sect2> <sect2>