diff options
| author | Pierre Labastie <pierre.labastie@neuf.fr> | 2021-09-07 23:25:03 +0200 |
|---|---|---|
| committer | Pierre Labastie <pierre.labastie@neuf.fr> | 2021-09-07 23:25:03 +0200 |
| commit | 9ee05b53be91de3ba41f3b0533240128fad4048d (patch) | |
| tree | f4b0535cdee11c9aaff8721f12c987945c98e9eb | |
| parent | 3781c69cbc45591ea4ac06868a65a0ee84151edd (diff) | |
Remove merge conflicts marks in chapter07/cleanup.xml
| -rw-r--r-- | chapter07/cleanup.xml | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/chapter07/cleanup.xml b/chapter07/cleanup.xml index 101105d99..47cf91094 100644 --- a/chapter07/cleanup.xml +++ b/chapter07/cleanup.xml @@ -105,15 +105,9 @@ umount $LFS/{sys,proc,run,dev}</userinput></screen> </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 system's <systemitem class="username">root</systemitem> user, which is typically found on the root filesystem. ->>>>>>> 8e6babecd0d75542a01eedfde32556879733f842 </para> <para> @@ -131,14 +125,6 @@ umount $LFS/{sys,proc,run,dev}</userinput></screen> Because the backup archive is compressed, it takes a relatively long time (over 10 minutes) even on a resonably fast system. </para> -<<<<<<< HEAD - - <para> - Also, ensure the <envar>LFS</envar> environment variable is set - for the root user. - </para> -======= ->>>>>>> 8e6babecd0d75542a01eedfde32556879733f842 </note> <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 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> |