瀏覽代碼

decorate usernames with <systemitem>

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@12071 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Xi Ruoyao 3 年之前
父節點
當前提交
34fe7e07cd

+ 2 - 1
chapter02/aboutlfs.xml

@@ -57,7 +57,8 @@
   host system.  If logging in through a graphical display manager, the
   host system.  If logging in through a graphical display manager, the
   user's <filename>.bash_profile</filename> is not normally used when
   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 export command to
-  the <filename>.bashrc</filename> file for the user and root.  In addition, 
+  the <filename>.bashrc</filename> file for the user and
+  <systemitem class="username">root</systemitem>.  In addition, 
   some distributions have instructions to not run the <filename>.bashrc</filename> 
   some distributions have instructions to not run the <filename>.bashrc</filename> 
   instructions in a non-interactive bash invocation.  Be sure to add the
   instructions in a non-interactive bash invocation.  Be sure to add the
   export command before the test for non-interactive use.</para>
   export command before the test for non-interactive use.</para>

+ 13 - 7
chapter02/stages.xml

@@ -25,9 +25,10 @@
   
   
     <itemizedlist>
     <itemizedlist>
       <listitem>
       <listitem>
-        <para>Procedures done as the root user after Section 2.4 need to 
-        have the LFS environment variable set <emphasis>FOR THE ROOT
-        USER</emphasis>.</para>
+        <para>Procedures done as the
+        <systemitem class="username">root</systemitem> user after Section
+        2.4 need to have the LFS environment variable set
+        <emphasis>FOR THE ROOT USER</emphasis>.</para>
       </listitem>
       </listitem>
     </itemizedlist>
     </itemizedlist>
   </sect2>
   </sect2>
@@ -41,7 +42,8 @@
       </listitem>
       </listitem>
 
 
       <listitem>
       <listitem>
-        <para>Threse two chapters must be done as user <emphasis>lfs</emphasis>.
+        <para>These two chapters <emphasis>must</emphasis> be done as user
+        <systemitem class="username">lfs</systemitem>.
         A <command>su - lfs</command> needs to be done before any task in these
         A <command>su - lfs</command> needs to be done before any task in these
         chapters. Failing to do that, you are at risk of installing packages to the
         chapters. Failing to do that, you are at risk of installing packages to the
         host, and potentially rendering it unusable.</para>
         host, and potentially rendering it unusable.</para>
@@ -68,18 +70,22 @@
       <listitem>
       <listitem>
         <para>A few operations, from <quote>Changing Ownership</quote> to
         <para>A few operations, from <quote>Changing Ownership</quote> to
         <quote>Entering the Chroot Environment</quote> must be done as the
         <quote>Entering the Chroot Environment</quote> must be done as the
-        root user, with the LFS environment variable set for the root user.</para>
+        <systemitem class="username">root</systemitem> user, with the LFS
+        environment variable set for the
+        <systemitem class="username">root</systemitem>user.</para>
       </listitem>
       </listitem>
 
 
       <listitem>
       <listitem>
          <para> When entering chroot, the LFS environment variable must be set
          <para> When entering chroot, the LFS environment variable must be set
-         for root. The LFS variable is not used afterwards.</para>
+         for <systemitem class="username">root</systemitem>. The LFS
+         variable is not used afterwards.</para>
       </listitem>
       </listitem>
 
 
       <listitem>
       <listitem>
          <para> The virtual file systems must be mounted.  This can be done
          <para> The virtual file systems must be mounted.  This can be done
          before or after entering chroot by changing to a host virtual terminal
          before or after entering chroot by changing to a host virtual terminal
-         and, as root, running the commands in 
+         and, as <systemitem class="username">root</systemitem>, running the
+         commands in 
          <xref linkend='ch-tools-bindmount'/> and 
          <xref linkend='ch-tools-bindmount'/> and 
          <xref linkend='ch-tools-kernfsmount'/>.</para>
          <xref linkend='ch-tools-kernfsmount'/>.</para>
       </listitem>
       </listitem>

+ 5 - 4
chapter05/glibc.xml

@@ -147,10 +147,11 @@ cd       build</userinput></screen>
     <para>Install the package:</para>
     <para>Install the package:</para>
 
 
     <warning><para>If <envar>LFS</envar> is not properly set, and despite the
     <warning><para>If <envar>LFS</envar> is not properly set, and despite the
-    recommendations, you are building as root, the next command will install
-    the newly built glibc to your host system, which most likely will render it
-    unusable. So double check that the environment is correctly set for user
-    <systemitem class="username">lfs</systemitem>.</para></warning>
+    recommendations, you are building as
+    <systemitem class="username">root</systemitem>, the next command will
+    install the newly built glibc to your host system, which most likely
+    will render it unusable. So double check that the environment is
+    correctly set, before running the following command.</para></warning>
 
 
 <screen><userinput remap="install">make DESTDIR=$LFS install</userinput></screen>
 <screen><userinput remap="install">make DESTDIR=$LFS install</userinput></screen>
 
 

+ 2 - 1
chapter06/introduction.xml

@@ -22,7 +22,8 @@
   independent of the host system yet.</para>
   independent of the host system yet.</para>
 
 
   <para>Once again, let us recall that improper setting of <envar>LFS</envar>
   <para>Once again, let us recall that improper setting of <envar>LFS</envar>
-  together with building as root, may render your computer unusable.
+  together with building as <systemitem class="username">root</systemitem>,
+  may render your computer unusable.
   This whole chapter must be done as user <systemitem
   This whole chapter must be done as user <systemitem
   class="username">lfs</systemitem>, with the environment as described in
   class="username">lfs</systemitem>, with the environment as described in
   <xref linkend="ch-preps-settingenviron"/>.</para>
   <xref linkend="ch-preps-settingenviron"/>.</para>

+ 1 - 1
chapter08/coreutils.xml

@@ -87,7 +87,7 @@ FORCE_UNSAFE_CONFIGURE=1 ./configure \
         <term><envar>FORCE_UNSAFE_CONFIGURE=1</envar></term>
         <term><envar>FORCE_UNSAFE_CONFIGURE=1</envar></term>
         <listitem>
         <listitem>
           <para>This environment variable allows the package to be 
           <para>This environment variable allows the package to be 
-          built as the root user.
+          built as the <systemitem class="username">root</systemitem> user.
           </para>
           </para>
         </listitem>
         </listitem>
       </varlistentry>
       </varlistentry>

+ 4 - 2
chapter08/tar.xml

@@ -56,8 +56,10 @@
         <term><envar>FORCE_UNSAFE_CONFIGURE=1</envar></term>
         <term><envar>FORCE_UNSAFE_CONFIGURE=1</envar></term>
         <listitem>
         <listitem>
           <para>This forces the test for <function>mknod</function> to be run
           <para>This forces the test for <function>mknod</function> to be run
-          as root.  It is generally considered dangerous to run this test as
-          the root user, but as it is being run on a system that has only been
+          as <systemitem class="username">root</systemitem>.
+          It is generally considered dangerous to run this test as
+          the <systemitem class="username">root</systemitem> user, but as it
+          is being run on a system that has only been
           partially built, overriding it is OK.</para>
           partially built, overriding it is OK.</para>
         </listitem>
         </listitem>
       </varlistentry>
       </varlistentry>

+ 2 - 1
chapter08/util-linux.xml

@@ -88,7 +88,8 @@
 
 
     <para>If desired, run the test suite as a non-root user:</para>
     <para>If desired, run the test suite as a non-root user:</para>
 
 
-    <warning><para>Running the test suite as the root user can be harmful to
+    <warning><para>Running the test suite as the
+    <systemitem class="username">root</systemitem> user can be harmful to
     your system.  To run it, the CONFIG_SCSI_DEBUG option for the kernel must
     your system.  To run it, the CONFIG_SCSI_DEBUG option for the kernel must
     be available in the currently running system and must be built as a
     be available in the currently running system and must be built as a
     module.  Building it into the kernel will prevent booting.  For complete
     module.  Building it into the kernel will prevent booting.  For complete

+ 2 - 1
chapter09/systemd-custom.xml

@@ -41,7 +41,8 @@ TTYVTDisallocate=no</literal>
 EOF</userinput></screen>
 EOF</userinput></screen>
 
 
     <para>The boot messages can always be reviewed by using the
     <para>The boot messages can always be reviewed by using the
-    <userinput>journalctl -b</userinput> command as the root user.</para>
+    <userinput>journalctl -b</userinput> command as the
+    <systemitem class="username">root</systemitem> user.</para>
 
 
   </sect2>
   </sect2>