Changeset c6f58f47 for chapter07/cleanup.xml

Timestamp:

09/07/2021 08:40:16 PM (3 years ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, arm, bdubbs/gcc13, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

2967da32

Parents:

2c8fdfc (diff), 8e6babe (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 branch 'trunk' of git.linuxfromscratch.org:lfs into trunk

File:

• chapter07/cleanup.xml (modified) (7 diffs)

chapter07/cleanup.xml

@@ -21 +21 @@
     <para>Second, the libtool .la files are only useful when linking with static
     libraries. They are unneeded and potentially harmful when using dynamic
-    shared libraries, specially when using non-autotools build systems.
+    shared libraries, especially when using non-autotools build systems.
     While still in chroot, remove those files now:</para>
 
@@ -37 +37 @@
   <sect2>
     <title>Backup</title>
+
+    <para>
+      At this point the essential programs and libraries have been created
+      and your current LFS system is in a good state. Your system can now be
+      backed up for later reuse. In case of fatal failures in the subsequent
+      chapters, it often turns out that removing everything and starting over
+      (more carefully) is the best option to recover. Unfortunately, all the
+      temporary files will be removed, too. To avoid spending extra time to
+      redo something which has been built successfully, creating a backup of
+      the current LFS system may prove useful.
+    </para>
 
     <note><para>
@@ -57 +68 @@
     </para>
 
+    <para>
+       If you have decided to make a backup, leave the chroot environment:
+    </para>
+
+<screen role="nodump"><userinput>exit</userinput></screen>
+
     <important>
-      <para>All of the following instructions are executed by
-        <systemitem class="username">root</systemitem>. Take extra
-        care about the commands you're going to run as mistakes
+      <para>
+        All of the following instructions are executed by
+        <systemitem class="username">root</systemitem> on your host system.
+        Take extra care about the commands you're going to run as mistakes
         here can modify your host system. Be aware that the
         environment variable <envar>LFS</envar>
         is set for user <systemitem class="username">lfs</systemitem> by default
         but may <emphasis>not</emphasis> be set for
-        <systemitem class="username">root</systemitem>. Whenever
-        commands are to be executed by <systemitem class="username">root</systemitem>,
+        <systemitem class="username">root</systemitem>.
+     </para>
+     <para>
+        Whenever commands are to be executed by <systemitem class="username">root</systemitem>,
         make sure you have set <envar>LFS</envar>.
+     </para>
+     <para>
         This has been discussed in <xref linkend='ch-partitioning-aboutlfs'/>.
       </para>
     </important>
 
-    <para>
-       Now, if you are making a backup, leave the chroot environment:
-    </para>
-
-<screen role="nodump"><userinput>exit</userinput></screen>
-
-    <para>
-      At this point the essential programs and libraries have been created
-      and your current system is in a good state. Your system can now be
-      backed up for later reuse. In case of fatal failures in the subsequent
-      chapters, it often turns out that removing everything and starting over
-      (more carefully) is the best option to recover. Unfortunately, all the
-      temporary files will be removed, too. To avoid spending extra time to
-      redo something which has been built successfully, prepare a backup.
-    </para>
-
-    <para>
+    <para>Before making a backup, unmount the virtual file systems:</para>
+
+<screen role="nodump"><userinput>umount $LFS/dev/pts
+umount $LFS/{sys,proc,run,dev}</userinput></screen>
+
+    <para>
+      Make sure you have at least 1 GB free disk space (the source tarballs
+      will be included in the backup archive) on the filesystem containing
+      directory where you create the backup archive.
+    </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>.
-    </para>
-
-    <para>Before we make a backup, unmount the virtual file systems:</para>
-
-<screen role="nodump"><userinput>umount $LFS/dev{/pts,}
-umount $LFS/{sys,proc,run}</userinput></screen>
+=======
+      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>
+      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>
 
     <para>
@@ -108 +132 @@
           long time (over 10 minutes) even on a resonably fast system.
        </para>
+<<<<<<< HEAD
 
        <para>
@@ -113 +138 @@
           for the root user.
        </para>
+=======
+>>>>>>> 8e6babecd0d75542a01eedfde32556879733f842
     </note>
 
@@ -121 +148 @@
 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
@@ -126 +154 @@
       class="username">root</systemitem>'s home directory.
     </para>
+=======
+>>>>>>> 8e6babecd0d75542a01eedfde32556879733f842
   </sect2>