Merge branch 'multilib' of git.linuxfromscratch.org:lfs into multilib

chapter02/aboutlfs.xml

@@ -28,11 +28,21 @@
   <quote>/mnt/lfs</quote> (or whatever value the variable was set to) when it
   processes the command line.</para>
 
-  <para>Now setting the file mode creation mask (umask) to
+  <para>Now set the file mode creation mask (umask) to
   <literal>022</literal> in case the host distro uses a different
   default:</para>
 
 <screen role="nodump"><userinput>umask 022</userinput></screen>
+
+  <para>Setting the umask to 022 ensures that newly created files and
+  directories are only writable by their owner, but are readable and
+  searchable (only for directories) by anyone (assuming default modes are
+  used by the <ulink role='man' url='&man;open.2'>open(2)</ulink> system
+  call, new files will end up with permission mode 644 and directories with
+  mode 755).  An overly-permissive default can leave security holes in the
+  LFS system, and an overly-restrictive default can cause strange issues
+  building or using the LFS system.</para>
+
   <caution>
   <para>Do not forget to check that <envar>LFS</envar> is set and the
   umask is set to <literal>022</literal> whenever
@@ -57,24 +67,26 @@
   given earlier on this page to set <envar>$LFS</envar> to the correct
   directory name and set umask to <literal>022</literal>.</para></caution>
 
-  <note><para>One way to ensure that the <envar>LFS</envar> variable is always
-  set is to edit the <filename>.bash_profile</filename> file in both your
-  personal home directory and in  <filename>/root/.bash_profile</filename> and
-  enter the export command above.  In addition, the shell specified in the
+  <note><para>One way to ensure that the <envar>LFS</envar> variable and the
+  umask are always set properly is to edit the
+  <filename>.bash_profile</filename> file in both your personal home
+  directory and in  <filename>/root/.bash_profile</filename> and
+  enter the <command>export</command> and <command>umask</command> commands
+  above.  In addition, the shell specified in the
   <filename>/etc/passwd</filename> file for all users that need the
   <envar>LFS</envar> variable must be bash to ensure that the
-  <filename>/root/.bash_profile</filename> file is incorporated as a part of
+  <filename>.bash_profile</filename> file is incorporated as a part of
   the login process.</para>
 
   <para>Another consideration is the method that is used to log into the
   host system.  If logging in through a graphical display manager, the
   user's <filename>.bash_profile</filename> is not normally used when
-  a virtual terminal is started.  In this case, add the export command to
+  a virtual terminal is started.  In this case, add the commands to
   the <filename>.bashrc</filename> file for the user and
   <systemitem class="username">root</systemitem>.  In addition,
   some distributions use an "if" test, and do not run the remaining <filename>.bashrc</filename>
   instructions for a non-interactive bash invocation.  Be sure to place the
-  export command ahead of the test for non-interactive use.</para>
+  commands ahead of the test for non-interactive use.</para>
 
   </note>
 

chapter02/mounting.xml

@@ -42,6 +42,15 @@ mount -v -t ext4 /dev/<replaceable>&lt;yyy&gt;</replaceable> $LFS/home</userinpu
   <replaceable>&lt;yyy&gt;</replaceable> with the appropriate partition
   names.</para>
 
+  <para>Set the owner and permission mode of the
+  <filename class='directory'>$LFS</filename> directory (i.e. the root
+  directory in the newly created file system for the LFS system) to
+  &root; and <literal>755</literal> in case the host distro has been
+  configured to use a different default for <command>mkfs</command>:</para>
+
+<screen role='nodump'><userinput>chown root:root $LFS
+chmod 755 $LFS</userinput></screen>
+
   <para>Ensure that this new partition is not mounted with permissions that are
   too restrictive (such as the <option>nosuid</option> or
   <option>nodev</option> options). Run the <command>mount</command> command

chapter04/creatingminlayout.xml

@@ -18,15 +18,6 @@
   location. We do this so those temporary programs will be overwritten when
   the final versions are built in <xref linkend="chapter-building-system"/>.</para>
 
-  <para>At first, set the owner and permission mode of the
-  <filename class='directory'>$LFS</filename> directory (i.e. the root
-  directory in the newly created file system for the LFS system) to
-  &root; and <literal>755</literal> in case the host distro has been
-  configured to use a different default for <command>mkfs</command>:</para>
-
-<screen><userinput>chown root:root $LFS
-chmod 755 $LFS</userinput></screen>
-
   <para>Create the required directory layout by issuing the following commands as
   <systemitem class="username">root</systemitem>:</para>
 

chapter04/settingenviron.xml

@@ -90,11 +90,8 @@ EOF</userinput></screen>
     <varlistentry>
       <term><parameter>umask 022</parameter></term>
       <listitem>
-  <para>Setting the user file-creation mask (umask) to 022 ensures that newly
-  created files and directories are only writable by their owner, but are
-  readable and executable by anyone (assuming default modes are used by the
-  <ulink role='man' url='&man;open.2'>open(2)</ulink> system call, new files
-  will end up with permission mode 644 and directories with mode 755).</para>
+        <para>Setting the umask as we've already explained in
+        <xref linkend='ch-partitioning-aboutlfs' role='.'/></para>
       </listitem>
     </varlistentry>
 

chapter08/procps.xml

@@ -67,8 +67,7 @@
 
     <para>Compile the package:</para>
 
-<screen revision='sysv'><userinput remap="make">make</userinput></screen>
-<screen revision='systemd'><userinput remap="make">make src_w_LDADD='$(LDADD) -lsystemd'</userinput></screen>
+<screen><userinput remap="make">make</userinput></screen>
 
     <!-- To editors: "pmap {X,XX} with unreachable process" tests don't work
          as root.  They may seem to pass due to some Tcl/Expect/DejaGNU