diff options
Diffstat (limited to 'chapter07')
| -rw-r--r-- | chapter07/chapter07.xml | 2 | ||||
| -rw-r--r-- | chapter07/cleanup.xml | 62 | ||||
| -rw-r--r-- | chapter07/kernfs.xml | 2 | ||||
| -rw-r--r-- | chapter07/perl.xml | 2 |
4 files changed, 45 insertions, 23 deletions
diff --git a/chapter07/chapter07.xml b/chapter07/chapter07.xml index 3706a6dfb..8c78f230a 100644 --- a/chapter07/chapter07.xml +++ b/chapter07/chapter07.xml @@ -24,7 +24,7 @@ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="python.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="texinfo.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux.xml"/> - + <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tcl.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="expect.xml"/> diff --git a/chapter07/cleanup.xml b/chapter07/cleanup.xml index 8e80bdc40..101105d99 100644 --- a/chapter07/cleanup.xml +++ b/chapter07/cleanup.xml @@ -9,7 +9,7 @@ <?dbhtml filename="cleanup.html"?> <title>Cleaning up and Saving the Temporary System</title> - + <sect2> <title>Cleaning</title> @@ -26,7 +26,7 @@ <screen><userinput>find /usr/{lib,libexec} -name \*.la -delete</userinput></screen> <para> - The current system size is now about 3 GB, however + The current system size is now about 3 GB, however the /tools directory is no longer needed. It uses about 1 GB of disk space. Delete it now: </para> @@ -53,9 +53,9 @@ as soon as you begin installing packages in <xref linkend="chapter-building-system"/>, the temporary files will be overwritten. So it may be a good idea to do a backup of the current - system as described below. + system as described below. </para></note> - + <para> The following steps are performed from outside the chroot environment. That means, you have to leave the chroot environment @@ -79,13 +79,13 @@ <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 + 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>. </para> <para> - Whenever commands are to be executed by <systemitem class="username">root</systemitem>, + Whenever commands are to be executed by <systemitem class="username">root</systemitem>, make sure you have set <envar>LFS</envar>. </para> <para> @@ -105,14 +105,20 @@ 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> Replace <envar>$HOME</envar> by a directory of your choice if you - do not want to have the backup stored in <systemitem + do not want to have the backup stored in <systemitem class="username">root</systemitem>'s home directory. </para> @@ -125,14 +131,30 @@ 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 +<screen role="nodump" revision="sysv"><userinput>cd $LFS 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> +<<<<<<< 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> @@ -141,7 +163,7 @@ tar -cJpf $HOME/lfs-temp-tools-&versiond;.tar.xz .</userinput></screen> <para> In case some mistakes have been made and you need to start over, you can use this backup to restore the system and save some recovery time. - Since the sources are located under + Since the sources are located under <filename class="directory">$LFS</filename>, they are included in the backup archive as well, so they do not need to be downloaded again. After checking that <envar>$LFS</envar> is set properly, @@ -152,17 +174,17 @@ tar -cJpf $HOME/lfs-temp-tools-&versiond;.tar.xz .</userinput></screen> restore when they don't need to. --> <warning><para>The following commands are extremly dangerous. If - you run <command>rm -rf ./*</command> as the root user and you - do not change to the $LFS directory or the <envar>LFS</envar> - environment variable is not set for the root user, it will destroy + you run <command>rm -rf ./*</command> as the root user and you + do not change to the $LFS directory or the <envar>LFS</envar> + environment variable is not set for the root user, it will destroy your entire host system. YOU ARE WARNED.</para></warning> -<screen role="nodump" revision="sysv"><computeroutput>cd $LFS -rm -rf ./* +<screen role="nodump" revision="sysv"><computeroutput>cd $LFS +rm -rf ./* tar -xpf $HOME/lfs-temp-tools-&version;.tar.xz</computeroutput></screen> -<screen role="nodump" revision="systemd"><computeroutput>cd $LFS -rm -rf ./* +<screen role="nodump" revision="systemd"><computeroutput>cd $LFS +rm -rf ./* tar -xpf $HOME/lfs-temp-tools-&versiond;.tar.xz</computeroutput></screen> <para> @@ -180,7 +202,7 @@ tar -xpf $HOME/lfs-temp-tools-&versiond;.tar.xz</computeroutput></screen> environment (see <xref linkend='ch-tools-chroot'/>) before continuing. </para> </important> - + </sect2> </sect1> diff --git a/chapter07/kernfs.xml b/chapter07/kernfs.xml index a23b7e195..f34155d7b 100644 --- a/chapter07/kernfs.xml +++ b/chapter07/kernfs.xml @@ -104,7 +104,7 @@ mount -vt tmpfs tmpfs $LFS/run</userinput></screen> --> <para>In some host systems, <filename>/dev/shm</filename> is a symbolic link to <filename class="directory">/run/shm</filename>. - The /run tmpfs was mounted above so in this case only a + The /run tmpfs was mounted above so in this case only a directory needs to be created.</para> <screen><userinput>if [ -h $LFS/dev/shm ]; then diff --git a/chapter07/perl.xml b/chapter07/perl.xml index 93ffb9a39..c99745c0d 100644 --- a/chapter07/perl.xml +++ b/chapter07/perl.xml @@ -60,7 +60,7 @@ <varlistentry> <term><parameter>-des</parameter></term> <listitem> - <para>This is a combination of three options: -d uses defaults for + <para>This is a combination of three options: -d uses defaults for all items; -e ensures completion of all tasks; -s silences non-essential output.</para> </listitem> |