Changeset 934e597 for BOOK

Timestamp:

Jul 8, 2006, 8:54:37 PM (18 years ago)

Author:

Chris Staub <chris@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

9176ba26

Parents:

b2011e5

Message:

More text changes in passwd/group file sections

Location:

BOOK

Files:

• boot/common/pwdgroup.xml (modified) (5 diffs)
• chroot/common/pwdgroup.xml (modified) (5 diffs)
• chroot/multilib/util-linux.xml (modified) (1 diff)

BOOK/boot/common/pwdgroup.xml

@@ -35 +35 @@
   </indexterm>
 
-  <para>In order for user <systemitem class="username">root</systemitem> to
+  <para os="a">In order for user <systemitem class="username">root</systemitem> to
   be able to login and for the name <quote>root</quote> to be recognized,
   there must be relevant entries in the <filename>/etc/passwd</filename>
@@ -47 +47 @@
 EOF</userinput></screen>
 
-  <para os="a">The actual password for <systemitem class="username">root</systemitem>
+  <para os="b">The actual password for <systemitem class="username">root</systemitem>
   (the <quote>::</quote> used here is just a placeholder and allow you to login
   with no password) will be set later.</para>
 
-  <variablelist os="b">
+  <variablelist os="c">
   
     <title>Additional users you may want to add:</title>
@@ -139 +139 @@
 EOF</userinput></screen>
 
-  <variablelist os="c">
+  <variablelist os="d">
 
     <title>Additional groups you may want to add</title>
@@ -199 +199 @@
   </variablelist>
 
-  <para os="d">The created groups are not part of any standard&mdash;they are
+  <para os="e">The created groups are not part of any standard&mdash;they are
   groups decided on in part by the requirements of the Udev configuration
   in the final system, and in part by common convention employed by a
@@ -210 +210 @@
   group's name.</para>
 
-  <para os="e">The <command>login</command>, <command>agetty</command>, and
+  <para os="f">The <command>login</command>, <command>agetty</command>, and
   <command>init</command> programs (and others) use a number of log
   files to record information such as who was logged into the system and

BOOK/chroot/common/pwdgroup.xml

@@ -35 +35 @@
   </indexterm>
 
-  <para>In order for user <systemitem class="username">root</systemitem> to
-  be able to login and for the name <quote>root</quote> to be recognized,
-  there must be relevant entries in the <filename>/etc/passwd</filename>
-  and <filename>/etc/group</filename> files.</para>
-
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../../boot/common/pwdgroup.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
+  
   <para>Create the <filename>/etc/passwd</filename> file by running the
   following command:</para>
@@ -47 +46 @@
 EOF</userinput></screen>
 
-  <para os="a">The actual password for
+  <para os="b">The actual password for
   <systemitem class="username">root</systemitem> (the <quote>x</quote>
   used here is just a placeholder) will be set later.</para>
@@ -53 +52 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../../boot/common/pwdgroup.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
+  xpointer="xpointer(//*[@os='c'])"/>
 
   <para>Create the <filename>/etc/group</filename> file by running the
@@ -79 +78 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../../boot/common/pwdgroup.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../boot/common/pwdgroup.xml"
   xpointer="xpointer(//*[@os='d'])"/>
 
@@ -88 +83 @@
   href="../../boot/common/pwdgroup.xml"
   xpointer="xpointer(//*[@os='e'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../../boot/common/pwdgroup.xml"
+  xpointer="xpointer(//*[@os='f'])"/>
 
   <para>To remove the <quote>I have no name!</quote> prompt, start a

BOOK/chroot/multilib/util-linux.xml

@@ -37 +37 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='ca'])"/>
+    xpointer="xpointer(//*[@os='bb'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"