Changeset 9ee05b53


Ignore:
Timestamp:
09/07/2021 09:25:03 PM (4 months ago)
Author:
Pierre Labastie <pierre.labastie@…>
Branches:
multilib, trunk
Children:
2da0137
Parents:
3781c69
Message:

Remove merge conflicts marks in chapter07/cleanup.xml

File:
1 edited

Legend:

Unmodified
Added
Removed
  • chapter07/cleanup.xml

    r3781c69 r9ee05b53  
    106106
    107107    <para>
    108 <<<<<<< HEAD
    109       Make sure you have at least 1 GB free disk space (the source tarballs
    110       will be included in the backup archive) in the home directory of user
    111       <systemitem class="username">root</systemitem>.
    112 =======
    113108      Note that the instructions below specify the home directory of the host
    114109      system's <systemitem class="username">root</systemitem> user, which is
    115110      typically found on the root filesystem.
    116 >>>>>>> 8e6babecd0d75542a01eedfde32556879733f842
    117111    </para>
    118112
     
    132126          long time (over 10 minutes) even on a resonably fast system.
    133127       </para>
    134 <<<<<<< HEAD
    135 
    136        <para>
    137           Also, ensure the <envar>LFS</envar> environment variable is set
    138           for the root user.
    139        </para>
    140 =======
    141 >>>>>>> 8e6babecd0d75542a01eedfde32556879733f842
    142128    </note>
    143129
     
    148134tar -cJpf $HOME/lfs-temp-tools-&versiond;.tar.xz .</userinput></screen>
    149135
    150 <<<<<<< HEAD
    151     <para>
    152       Replace <envar>$HOME</envar> by a directory of your choice if you
    153       do not want to have the backup stored in <systemitem
    154       class="username">root</systemitem>'s home directory.
    155     </para>
    156 =======
    157 >>>>>>> 8e6babecd0d75542a01eedfde32556879733f842
    158136  </sect2>
    159137
Note: See TracChangeset for help on using the changeset viewer.