Changeset 981e0c4 for chapter04

Timestamp:

10/28/2022 10:30:10 PM (18 months ago)

Author:

Thomas Trepl (Moody) <thomas@…>

Branches:

multilib

Children:

07fd8bf8

Parents:

f9e8271 (diff), c389124 (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:

Automatic merge of trunk into multilib

Location:

chapter04

Files:

• addinguser.xml (modified) (2 diffs)
• settingenviron.xml (modified) (9 diffs)

chapter04/addinguser.xml

@@ -63 +63 @@
       <term><parameter>lfs</parameter></term>
       <listitem>
-        <para>This is the actual name for the created user.</para>
+        <para>This is the name of the new user.</para>
       </listitem>
     </varlistentry>
@@ -72 +72 @@
   non-&root; user (as opposed to switching to user &lfs-user;
   when logged in as &root;, which does not require the &lfs-user; user to
-  have a password), you need to set a password of &lfs-user;.  Issue the
+  have a password), you need to set a password for &lfs-user;.  Issue the
   following command as the &root; user to set the password:</para>
 

chapter04/settingenviron.xml

@@ -20 +20 @@
 EOF</userinput></screen>
 
-  <para>When logged on as user <systemitem class="username">lfs</systemitem>
-  or switched to the &lfs-user; user using a <command>su</command> command
-  with <quote><parameter>-</parameter></quote> option,
+  <para>When logged on as user <systemitem class="username">lfs</systemitem>,
+  or when switched to the &lfs-user; user using an <command>su</command> command
+  with the <quote><parameter>-</parameter></quote> option,
   the initial shell is a <emphasis>login</emphasis> shell which reads
   the <filename>/etc/profile</filename> of the host (probably containing some
@@ -31 +31 @@
   <envar>TERM</envar>, and <envar>PS1</envar> variables. This ensures that no
   unwanted and potentially hazardous environment variables from the host system
-  leak into the build environment. The technique used here achieves the goal of
-  ensuring a clean environment.</para>
+  leak into the build environment.</para>
 
   <para>The new instance of the shell is a <emphasis>non-login</emphasis>
@@ -115 +114 @@
   Setting <envar>LC_ALL</envar> to <quote>POSIX</quote> or <quote>C</quote>
   (the two are equivalent) ensures that everything will work as expected in
-  the chroot environment.</para>
+  the cross-compilation environment.</para>
       </listitem>
     </varlistentry>
@@ -123 +122 @@
       <listitem>
   <para>The <envar>LFS_TGT</envar> variable sets a non-default, but compatible machine
-  description for use when building our cross compiler and linker and when cross
-  compiling our temporary toolchain. More information is contained in
+  description for use when building our cross-compiler and linker and when
+  cross-compiling our temporary toolchain. More information is provided by
   <xref linkend="ch-tools-toolchaintechnotes" role=""/>.</para>
       </listitem>
@@ -147 +146 @@
       <listitem>
   <para>If <filename class="directory">/bin</filename> is not a symbolic
-  link, then it has to be added to the <envar>PATH</envar> variable.</para>
+  link, it must be added to the <envar>PATH</envar> variable.</para>
       </listitem>
     </varlistentry>
@@ -178 +177 @@
       <term><parameter>export ...</parameter></term>
       <listitem>
-        <para>While the above commands have set some variables, in order
+        <para>While the preceding commands have set some variables, in order
         to make them visible within any sub-shells, we export them.</para>
       </listitem>
@@ -187 +186 @@
   <important>
 
-     <para>Several commercial distributions add a non-documented instantiation
+     <para>Several commercial distributions add an undocumented instantiation
      of <filename>/etc/bash.bashrc</filename> to the initialization of
      <command>bash</command>. This file has the potential to modify the
@@ -200 +199 @@
      <screen role="nodump"><userinput>[ ! -e /etc/bash.bashrc ] || mv -v /etc/bash.bashrc /etc/bash.bashrc.NOUSE</userinput></screen>
 
-     <para>After use of the <systemitem class="username">lfs</systemitem>
-     user is finished at the beginning of <xref
-     linkend="chapter-chroot-temporary-tools"/>, you can restore
+     <para>When the <systemitem class="username">lfs</systemitem>
+     user is no longer needed (at the beginning of <xref
+     linkend="chapter-chroot-temporary-tools"/>), you may safely restore
      <filename>/etc/bash.bashrc</filename> (if desired).</para>
 
@@ -211 +210 @@
   </important>
 
-  <para>Finally, to have the environment fully prepared for building the
+  <para>Finally, to ensure the environment is fully prepared for building the
   temporary tools, force the <command>bash</command> shell to read
   the new user profile:</para>