Update to util-linix-ng-2.18

 Exapand and reformat notes concerning grub.cfg

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9330 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

5 files changed, 105 insertions, 25 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index c252e2a24..624af6c2e 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,6 +37,21 @@
 
 -->
     <listitem>
+      <para>2010-07-02</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Exapand and reformat notes concerning
+           grub.cfg.</para>
+        </listitem>
+         <listitem>
+           <para>[bdubbs] - Updated to util-linix-ng-2.18. 
+           Fixes
+           <ulink url="&lfs-ticket-root;2681">#2681</ulink>.</para>
+         </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2010-07-01</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter06/util-linux-ng.xml b/chapter06/util-linux-ng.xml
index 94a554227..592004070 100644
--- a/chapter06/util-linux-ng.xml
+++ b/chapter06/util-linux-ng.xml
@@ -109,15 +109,16 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
       <seglistitem>
         <seg>addpart, agetty, arch, blkid, blockdev, cal, cfdisk, chkdupexe,
         chrt, col, colcrt, colrm, column, ctrlaltdel, cytune, ddate, delpart,
-        dmesg, fallocate, fdformat, fdisk, findfs, flock, fsck, fsck.cramfs,
-        fsck.minix, getopt, hexdump, hwclock, i386, ionice, ipcmk, ipcrm, ipcs,
-        isosize, ldattach, line, linux32, linux64, logger, look, losetup, lscpu,
-        mcookie, mkfs, mkfs.bfs, mkfs.cramfs, mkfs.minix, mkswap, more, mount,
-        namei, partx, pg, pivot_root, readprofile, rename, renice, rev,
-        rtcwake, script, scriptreplay, setarch, setsid, setterm, sfdisk,
-        swapoff (link to swapon), swapon, switch_root, tailf, taskset, tunelp,
-        ul, umount, unshare, uuidd, uuidgen, wall, whereis, wipefs, and write</seg>
-        <seg>libblkid.{a,so}, libuuid.{a,so}</seg>
+        dmesg, fallocate, fdformat, fdisk, findfs, findmnt, flock, fsck,
+        fsck.cramfs, fsck.minix, fsfreeze, getopt, hexdump, hwclock, i386,
+        ionice, ipcmk, ipcrm, ipcs, isosize, ldattach, line, linux32, linux64,
+        logger, look, losetup, lscpu, mcookie, mkfs, mkfs.bfs, mkfs.cramfs,
+        mkfs.minix, mkswap, more, mount, namei, partx, pg, pivot_root,
+        readprofile, rename, renice, rev, rtcwake, script, scriptreplay,
+        setarch, setsid, setterm, sfdisk, swaplabel, swapoff (link to swapon),
+        swapon, switch_root, tailf, taskset, tunelp, ul, umount, unshare,
+        uuidd, uuidgen, wall, whereis, wipefs, and write</seg>
+        <seg>libblkid.{a,so}, libmount.{a,so}, libuuid.{a,so}</seg>
         <seg>/usr/share/getopt, /var/lib/hwclock</seg>
       </seglistitem>
     </segmentedlist>
@@ -355,6 +356,17 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="findmnt">
+        <term><command>findmnt</command></term>
+        <listitem>
+          <para>Is a command line interface to the libmount library 
+          for work with mountinfo, fstab and mtab files</para>
+          <indexterm zone="ch-system-util-linux-ng findmnt">
+            <primary sortas="b-findmnt">findmnt</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="flock">
         <term><command>flock</command></term>
         <listitem>
@@ -398,6 +410,17 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="fsfreeze">
+        <term><command>fsfreeze</command></term>
+        <listitem>
+          <para>Is a very simple wrapper around FIFREEZE/FITHAW ioctl 
+          kernel driver operations</para>
+          <indexterm zone="ch-system-util-linux-ng fsfreeze">
+            <primary sortas="b-fsfreeze">fsfreeze</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="getopt">
         <term><command>getopt</command></term>
         <listitem>
@@ -810,6 +833,16 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="swaplabel">
+        <term><command>swaplabel</command></term>
+        <listitem>
+          <para>Allows to change swaparea UUID and label</para>
+          <indexterm zone="ch-system-util-linux-ng swaplabel">
+            <primary sortas="b-swaplabel">swaplabel</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="swapoff">
         <term><command>swapoff</command></term>
         <listitem>
diff --git a/chapter08/grub.xml b/chapter08/grub.xml
index 08ba1c4e5..cf0b4fbe4 100644
--- a/chapter08/grub.xml
+++ b/chapter08/grub.xml
@@ -109,7 +109,7 @@ set timeout=5
 ### END /etc/grub.d/00_header ###
 
 ### BEGIN /etc/grub.d/10_linux ###
-menuentry "GNU/Linux, Linux 2.6.30.2-lfs65" {
+menuentry "GNU/Linux, Linux 2.6.34-lfs" {
         insmod ext2
         set root=(hd0,2)
         search --no-floppy --fs-uuid --set 915852a7-859e-45a6-9ff0-d3ebfdb5cea2
@@ -147,13 +147,45 @@ menuentry "GNU/Linux, Linux 2.6.28-11-server (recovery mode)" {
 ### END /etc/grub.d/40_custom ###
 </computeroutput></screen>
 
-  <para>Note that even though there is a warning not to edit the file, you can
-  do so as long as you do not re-run <command>grub-mkconfig</command>.  The
-  <emphasis>search</emphasis> lines are not meaningful for LFS systems as that
-  command needs an initrd image for processing. If installing on a separate
-  partition the linux and initrd lines will not have the /boot on the file
-  names.  In this example the kernel files for a Ubuntu installation are
-  also found in <filename class="directory">/boot</filename>.</para>
+  <note>
+  <itemizedlist>
+      <listitem><para>Even though there is a warning not to edit the file, you
+      can do so as long as you do not re-run
+      <command>grub-mkconfig</command>.</para></listitem>
+
+      <listitem><para>The <emphasis>search</emphasis> lines are generally not
+      useful for LFS systems as that command only sets an internal GRUB
+      variable used to find the kernel image.  The <emphasis>set root</emphasis> 
+      command provides the same capability without the overhead of 
+      searching.</para></listitem>
+  
+      <listitem><para>The <emphasis>set root</emphasis> and 
+      <emphasis>insmod ext2</emphasis> commands can be moved out of the  
+      <emphasis>menuentry</emphasis> sections to apply to all sections of the file.
+      This leads to a simple section like:</para></listitem>
+
+      </itemizedlist>
+<screen><computeroutput>menuentry "Linux &linux-version;-lfs-&version;" {
+linux   /boot/vmlinux-&linux-version;-lfs-&version; root=/dev/sda2 ro
+}
+</computeroutput></screen>
+  
+  <itemizedlist>
+
+      <listitem><para>Passing a UUID to the kernel requires an initial ram disk
+      (initrd) not built by LFS.</para></listitem>
+  
+      <listitem><para>If the <filename>/boot</filename> partition is installed
+      on a separate partition, the linux and initrd lines should not have the
+      string <emphasis>/boot</emphasis> prefixed to the file
+      names.</para></listitem> 
+  
+      <listitem><para>In this example the kernel files for a Ubuntu
+      installation are also found in <filename
+      class="directory">/boot</filename>.</para></listitem>
+
+   </itemizedlist>
+   </note>
 
   </sect2>
    
diff --git a/general.ent b/general.ent
index abb9e3069..d8d7dd2ab 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20100701">
-<!ENTITY releasedate "July 1, 2010">
+<!ENTITY version "SVN-20100702">
+<!ENTITY releasedate "July 2, 2010">
 <!ENTITY copyrightdate "1999-2010"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "6.7">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index 5bae91d96..6c94e8928 100644
--- a/packages.ent
+++ b/packages.ent
@@ -532,14 +532,14 @@
 <!ENTITY udev-config-md5 "UDEV-MD5SUM">      <!-- Updated in Makefile -->
 <!ENTITY udev-config-home " ">
 
-<!ENTITY util-linux-ng-version "2.17.2">
-<!ENTITY util-linux-ng-size "3,726 KB">
+<!ENTITY util-linux-ng-version "2.18">
+<!ENTITY util-linux-ng-size "7,490 KB">
 <!ENTITY util-linux-ng-url "&kernel;linux/utils/util-linux-ng/v2.17/util-linux-ng-&util-linux-ng-version;.tar.bz2">
-<!ENTITY util-linux-ng-md5 "4635725a3eef1c57090bac8ea5e082e6">
+<!ENTITY util-linux-ng-md5 "2f5f71e6af969d041d73ab778c141a77">
 <!ENTITY util-linux-ng-home "http://userweb.kernel.org/~kzak/util-linux-ng/">
-<!ENTITY util-linux-ng-ch5-du "19 MB">
-<!ENTITY util-linux-ng-ch5-sbu "0.1 SBU">
-<!ENTITY util-linux-ng-ch6-du "40 MB">
+<!--<!ENTITY util-linux-ng-ch5-du "19 MB">-->
+<!--<!ENTITY util-linux-ng-ch5-sbu "0.1 SBU">-->
+<!ENTITY util-linux-ng-ch6-du "49 MB">
 <!ENTITY util-linux-ng-ch6-sbu "0.6 SBU">
 
 <!ENTITY vim-version "7.2">