Changeset 03e6a40 for BOOK/final-system/common/util-linux.xml

Timestamp:

Apr 20, 2014, 8:57:39 AM (11 years ago)

Author:

Chris Staub <chris@…>

Children:

0be79ea

Parents:

88ef769 (diff), 578ca586 (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:

Merge branch 'systemd' into simp

Conflicts:

BOOK/final-system/common/bash.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/bash.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/general.ent
BOOK/packages.ent
BOOK/temp-system/common/bash.xml
BOOK/temp-system/mips64-64-chapter.xml
BOOK/temp-system/mips64-chapter.xml
BOOK/temp-system/multilib/bash.xml
BOOK/temp-system/ppc64-64-chapter.xml
BOOK/temp-system/ppc64-chapter.xml
BOOK/temp-system/sparc64-64-chapter.xml
BOOK/temp-system/sparc64-chapter.xml
BOOK/temp-system/x86_64-64-chapter.xml
BOOK/temp-system/x86_64-chapter.xml

File:

• BOOK/final-system/common/util-linux.xml (modified) (5 diffs)

BOOK/final-system/common/util-linux.xml

@@ -42 +42 @@
     <title>Installation of Util-linux</title>
 
+    <note os="n">
+      <para><command>findmnt</command>, and <command>lsblk</command> can
+      utilize <filename class="libraryfile">libudev</filename> for WWN and serial
+      number information. If this is desired, rebuild Util-linux after
+      <xref linkend="ch-system-systemd"/></para>
+    </note>
+
     <para os="a">Prepare Util-linux for compilation:</para>
 
-<screen os="b"><userinput>./configure --enable-write</userinput></screen>
+<screen os="b"><userinput>./configure --enable-write --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
 
     <variablelist os="c">
@@ -63 +70 @@
 <screen os="e"><userinput>make</userinput></screen>
 
-    <para os="dummy1">Create two <systemitem class="groupname">dummy</systemitem> groups and a <systemitem class="username">dummy</systemitem> user to be used during Util-linux and Coreutils test suites:</para>
-
-<screen os="dummy2"><userinput remap="test">echo "dummy1:x:1000:" &gt;&gt; /etc/group
-echo "dummy2:x:1001:dummy" &gt;&gt; /etc/group
-echo "dummy:x:1000:1000::/root:/bin/bash" &gt;&gt; /etc/passwd</userinput></screen>
-
     <para os="f">To test the results, issue:</para>
 
-<screen os="f2"><userinput remap="test">chown -Rv dummy . &amp;&amp;
-su dummy -s /bin/bash -c "PATH=$PATH make -k check"</userinput></screen>
+<screen os="f2"><userinput remap="test">chown -Rv nobody . &amp;&amp;
+su nobody -s /bin/bash -c "PATH=$PATH make -k check"</userinput></screen>
 
     <para os="g">Install the package:</para>
 
 <screen os="h"><userinput>make install</userinput></screen>
-
-    <para os="i">Move the <command>logger</command> binary to
-    <filename class="directory">/bin</filename> as it is needed by the
-    CLFS-Bootscripts package:</para>
-
-<screen os="j"><userinput>mv -v /usr/bin/logger /bin</userinput></screen>
 
   </sect2>
@@ -109 +104 @@
         <seg>libblkid.[a,so], libmount.[a,so], and libuuid.[a,so]</seg>
         <seg>/usr/include/blkid, /usr/include/libmount, /usr/include/uuid,
-        /usr/share/doc/util-linux/getopt, /var/lib/hwclock</seg>
+        /usr/share/bash-completion,
+        /usr/share/doc/util-linux-&util-linux-version;/getopt,
+        /var/lib/hwclock</seg>
       </seglistitem>
     </segmentedlist>
@@ -270 +267 @@
           <indexterm zone="ch-system-util-linux cytune">
             <primary sortas="b-cytune">cytune</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ddate">
-        <term><command>ddate</command></term>
-        <listitem>
-          <para>Gives the Discordian date or converts the given Gregorian date
-          to a Discordian one</para>
-          <indexterm zone="ch-system-util-linux ddate">
-            <primary sortas="b-ddate">ddate</primary>
           </indexterm>
         </listitem>
@@ -598 +584 @@
         <term><command>lscpu</command></term>
         <listitem>
-          <para>Prints CPU architechture information</para>
+          <para>Prints CPU architecture information</para>
           <indexterm zone="ch-system-util-linux lscpu">
             <primary sortas="b-lscpu">lscpu</primary>