Index: BOOK/final-system/alpha-chapter.xml
===================================================================
--- BOOK/final-system/alpha-chapter.xml	(revision ad7417378baa763d31265ce81c3ddae67534da8f)
+++ BOOK/final-system/alpha-chapter.xml	(revision 3a5c139f2bb226607d62c7d1bf364a9efa2db515)
@@ -59,5 +59,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux-ng.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/aboutdebug.xml"/>
Index: BOOK/final-system/arm-chapter.xml
===================================================================
--- BOOK/final-system/arm-chapter.xml	(revision ad7417378baa763d31265ce81c3ddae67534da8f)
+++ BOOK/final-system/arm-chapter.xml	(revision 3a5c139f2bb226607d62c7d1bf364a9efa2db515)
@@ -59,5 +59,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux-ng.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/aboutdebug.xml"/>
Index: BOOK/final-system/common/util-linux-ng.xml
===================================================================
--- BOOK/final-system/common/util-linux-ng.xml	(revision 3a5c139f2bb226607d62c7d1bf364a9efa2db515)
+++ BOOK/final-system/common/util-linux-ng.xml	(revision 3a5c139f2bb226607d62c7d1bf364a9efa2db515)
@@ -0,0 +1,752 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-util-linux-ng" role="wrap">
+  <?dbhtml filename="util-linux-ng.html"?>
+
+  <title>Util-linux-ng-&util-linux-ng-version;</title>
+
+  <indexterm zone="ch-system-util-linux-ng">
+    <primary sortas="a-Util-linux-ng">Util-linux-ng</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>The Util-linux-ng package contains miscellaneous utility programs.
+    Among them are utilities for handling file systems, consoles, partitions,
+    and messages.</para>
+
+
+  </sect2>
+
+  <sect2 id="fhs-util-linux-ng" role="installation">
+    <title>FHS compliance notes</title>
+
+    <para>The FHS recommends using the <filename
+    class="directory">/var/lib/hwclock</filename> directory instead of the
+    usual <filename class="directory">/etc</filename> directory as the
+    location for the <filename>adjtime</filename> file. To make the
+    <command>hwclock</command> program FHS-compliant, run the following:</para>
+
+<screen><userinput>cp hwclock/hwclock.c{,.orig}
+sed -e 's@etc/adjtime@var/lib/hwclock/adjtime@g' \
+    hwclock/hwclock.c.orig > hwclock/hwclock.c
+mkdir -pv /var/lib/hwclock</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Util-linux-ng</title>
+
+    <para os="a">Prepare Util-linux-ng for compilation:</para>
+
+<screen os="b"><userinput>./configure --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+    --with-fsprobe=blkid --enable-agetty \
+    --enable-cramfs --disable-init --disable-kill --disable-last \
+    --disable-mesg --enable-partx --enable-rename --disable-reset \
+    --disable-login-utils --enable-schedutils --disable-wall --enable-write \
+    --without-pam</userinput></screen>
+
+    <para os="c">Compile the package:</para>
+
+<screen os="d"><userinput>make</userinput></screen>
+
+    <para os="e">This package does not come with a test suite.</para>
+
+    <para os="g">Install the package:</para>
+
+<screen os="h"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
+
+  </sect2>
+
+  <sect2 id="contents-util-linux-ng" role="content">
+    <title>Contents of Util-linux-ng</title>
+
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+
+      <seglistitem>
+        <seg>agetty, arch, blockdev, cal, cfdisk, chkdupexe, col, colcrt,
+        colrm, column, ctrlaltdel, cytune, ddate, dmesg, elvtune, fdformat,
+        fdisk, flock, fsck.cramfs, fsck.minix, getopt, hexdump, hwclock, ipcrm,
+        ipcs, isosize, line, logger, look, losetup, mcookie, mkfs, mkfs.bfs,
+        mkfs.cramfs, mkfs.minix, mkswap, more, mount, namei, pg, pivot_root,
+        ramsize (link to rdev), raw, rdev, readprofile, rename, renice, rev,
+        rootflags (link to rdev), script, setfdprm, setsid, setterm, sfdisk,
+        swapoff (link to swapon), swapon, tailf, tunelp, ul, umount, vidmode
+        (link to rdev), whereis, and write</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="agetty">
+        <term><command>agetty</command></term>
+        <listitem>
+          <para>Opens a tty port, prompts for a login name,
+          and then invokes the <command>login</command> program</para>
+          <indexterm zone="ch-system-util-linux-ng agetty">
+            <primary sortas="b-agetty">agetty</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="arch">
+        <term><command>arch</command></term>
+        <listitem>
+          <para>Reports the machine's architecture</para>
+          <indexterm zone="ch-system-util-linux-ng arch">
+            <primary sortas="b-arch">arch</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="blockdev">
+        <term><command>blockdev</command></term>
+        <listitem>
+          <para>Allows users to call block device ioctls from the command
+          line</para>
+          <indexterm zone="ch-system-util-linux-ng blockdev">
+            <primary sortas="b-blockdev">blockdev</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="cal">
+        <term><command>cal</command></term>
+        <listitem>
+          <para>Displays a simple calendar</para>
+          <indexterm zone="ch-system-util-linux-ng cal">
+            <primary sortas="b-cal">cal</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="cfdisk">
+        <term><command>cfdisk</command></term>
+        <listitem>
+          <para>Manipulates the partition table of the given device</para>
+          <indexterm zone="ch-system-util-linux-ng cfdisk">
+            <primary sortas="b-cfdisk">cfdisk</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="chkdupexe">
+        <term><command>chkdupexe</command></term>
+        <listitem>
+          <para>Finds duplicate executables</para>
+          <indexterm zone="ch-system-util-linux-ng chkdupexe">
+            <primary sortas="b-chkdupexe">chkdupexe</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="col">
+        <term><command>col</command></term>
+        <listitem>
+          <para>Filters out reverse line feeds</para>
+          <indexterm zone="ch-system-util-linux-ng col">
+            <primary sortas="b-col">col</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="colcrt">
+        <term><command>colcrt</command></term>
+        <listitem>
+          <para>Filters <command>nroff</command> output for terminals
+          that lack some capabilities, such as overstriking and half-lines</para>
+          <indexterm zone="ch-system-util-linux-ng colcrt">
+            <primary sortas="b-colcrt">colcrt</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="colrm">
+        <term><command>colrm</command></term>
+        <listitem>
+          <para>Filters out the given columns</para>
+          <indexterm zone="ch-system-util-linux-ng colrm">
+            <primary sortas="b-colrm">colrm</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="column">
+        <term><command>column</command></term>
+        <listitem>
+          <para>Formats a given file into multiple columns</para>
+          <indexterm zone="ch-system-util-linux-ng column">
+            <primary sortas="b-column">column</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ctrlaltdel">
+        <term><command>ctrlaltdel</command></term>
+        <listitem>
+          <para>Sets the function of the Ctrl+Alt+Del key combination to a
+          hard or a soft reset</para>
+          <indexterm zone="ch-system-util-linux-ng ctrlaltdel">
+            <primary sortas="b-ctrlaltdel">ctrlaltdel</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="cytune">
+        <term><command>cytune</command></term>
+        <listitem>
+          <para>Tunes the parameters of the serial line drivers for
+          Cyclades cards</para>
+          <indexterm zone="ch-system-util-linux-ng 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-ng ddate">
+            <primary sortas="b-ddate">ddate</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="dmesg">
+        <term><command>dmesg</command></term>
+        <listitem>
+          <para>Dumps the kernel boot messages</para>
+          <indexterm zone="ch-system-util-linux-ng dmesg">
+            <primary sortas="b-dmesg">dmesg</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="elvtune">
+        <term><command>elvtune</command></term>
+        <listitem>
+          <para>Tunes the performance and interactivity of a block
+          device</para>
+          <indexterm zone="ch-system-util-linux-ng elvtune">
+            <primary sortas="b-elvtune">elvtune</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="fdformat">
+        <term><command>fdformat</command></term>
+        <listitem>
+          <para>Low-level formats a floppy disk</para>
+          <indexterm zone="ch-system-util-linux-ng fdformat">
+            <primary sortas="b-fdformat">fdformat</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="fdisk">
+        <term><command>fdisk</command></term>
+        <listitem>
+          <para>Manipulates the partition table of the given device</para>
+          <indexterm zone="ch-system-util-linux-ng fdisk">
+            <primary sortas="b-fdisk">fdisk</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="flock">
+        <term><command>flock</command></term>
+        <listitem>
+          <para>Acquires a file lock and then executes a command with the lock
+          held</para>
+          <indexterm zone="ch-system-util-linux-ng flock">
+            <primary sortas="b-flock">flock</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="fsck.cramfs">
+        <term><command>fsck.cramfs</command></term>
+        <listitem>
+          <para>Performs a consistency check on the Cramfs file system on the
+          given device</para>
+          <indexterm zone="ch-system-util-linux-ng fsck.cramfs">
+            <primary sortas="b-fsck.cramfs">fsck.cramfs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="fsck.minix">
+        <term><command>fsck.minix</command></term>
+        <listitem>
+          <para>Performs a consistency check on the Minix file system on the
+          given device</para>
+          <indexterm zone="ch-system-util-linux-ng fsck.minix">
+            <primary sortas="b-fsck.minix">fsck.minix</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="getopt">
+        <term><command>getopt</command></term>
+        <listitem>
+          <para>Parses options in the given command line</para>
+          <indexterm zone="ch-system-util-linux-ng getopt">
+            <primary sortas="b-getopt">getopt</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="hexdump">
+        <term><command>hexdump</command></term>
+        <listitem>
+          <para>Dumps the given file in hexadecimal or in another given
+          format</para>
+          <indexterm zone="ch-system-util-linux-ng hexdump">
+            <primary sortas="b-hexdump">hexdump</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="hwclock">
+        <term><command>hwclock</command></term>
+        <listitem>
+          <para>Reads or sets the system's hardware clock, also called
+          the Real-Time Clock (RTC) or Basic Input-Output System (BIOS)
+          clock</para>
+          <indexterm zone="ch-system-util-linux-ng hwclock">
+            <primary sortas="b-hwclock">hwclock</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ipcrm">
+        <term><command>ipcrm</command></term>
+        <listitem>
+          <para>Removes the given Inter-Process Communication (IPC) resource</para>
+          <indexterm zone="ch-system-util-linux-ng ipcrm">
+            <primary sortas="b-ipcrm">ipcrm</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ipcs">
+        <term><command>ipcs</command></term>
+        <listitem>
+          <para>Provides IPC status information</para>
+          <indexterm zone="ch-system-util-linux-ng ipcs">
+            <primary sortas="b-ipcs">ipcs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="isosize">
+        <term><command>isosize</command></term>
+        <listitem>
+          <para>Reports the size of an iso9660 file system</para>
+          <indexterm zone="ch-system-util-linux-ng isosize">
+            <primary sortas="b-isosize">isosize</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="line">
+        <term><command>line</command></term>
+        <listitem>
+          <para>Copies a single line</para>
+          <indexterm zone="ch-system-util-linux-ng line">
+            <primary sortas="b-line">line</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="logger">
+        <term><command>logger</command></term>
+        <listitem>
+          <para>Enters the given message into the system log</para>
+          <indexterm zone="ch-system-util-linux-ng logger">
+            <primary sortas="b-logger">logger</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="look">
+        <term><command>look</command></term>
+        <listitem>
+          <para>Displays lines that begin with the given string</para>
+          <indexterm zone="ch-system-util-linux-ng look">
+            <primary sortas="b-look">look</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="losetup">
+        <term><command>losetup</command></term>
+        <listitem>
+          <para>Sets up and controls loop devices</para>
+          <indexterm zone="ch-system-util-linux-ng losetup">
+            <primary sortas="b-losetup">losetup</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mcookie">
+        <term><command>mcookie</command></term>
+        <listitem>
+          <para>Generates magic cookies (128-bit random hexadecimal numbers) for
+          <command>xauth</command></para>
+          <indexterm zone="ch-system-util-linux-ng mcookie">
+            <primary sortas="b-mcookie">mcookie</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mkfs">
+        <term><command>mkfs</command></term>
+        <listitem>
+          <para>Builds a file system on a device (usually a hard disk
+          partition)</para>
+          <indexterm zone="ch-system-util-linux-ng mkfs">
+            <primary sortas="b-mkfs">mkfs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mkfs.bfs">
+        <term><command>mkfs.bfs</command></term>
+        <listitem>
+          <para>Creates a Santa Cruz Operations (SCO) bfs file system</para>
+          <indexterm zone="ch-system-util-linux-ng mkfs.bfs">
+            <primary sortas="b-mkfs.bfs">mkfs.bfs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mkfs.cramfs">
+        <term><command>mkfs.cramfs</command></term>
+        <listitem>
+          <para>Creates a cramfs file system</para>
+          <indexterm zone="ch-system-util-linux-ng mkfs.cramfs">
+            <primary sortas="b-mkfs.cramfs">mkfs.cramfs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mkfs.minix">
+        <term><command>mkfs.minix</command></term>
+        <listitem>
+          <para>Creates a Minix file system</para>
+          <indexterm zone="ch-system-util-linux-ng mkfs.minix">
+            <primary sortas="b-mkfs.minix">mkfs.minix</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mkswap">
+        <term><command>mkswap</command></term>
+        <listitem>
+          <para>Initializes the given device or file to be used as a swap
+          area</para>
+          <indexterm zone="ch-system-util-linux-ng mkswap">
+            <primary sortas="b-mkswap">mkswap</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="more">
+        <term><command>more</command></term>
+        <listitem>
+          <para>A filter for paging through text one screen at a time</para>
+          <indexterm zone="ch-system-util-linux-ng more">
+            <primary sortas="b-more">more</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mount">
+        <term><command>mount</command></term>
+        <listitem>
+          <para>Attaches the file system on the given device to a specified
+          directory in the file-system tree</para>
+          <indexterm zone="ch-system-util-linux-ng mount">
+            <primary sortas="b-mount">mount</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="namei">
+        <term><command>namei</command></term>
+        <listitem>
+          <para>Shows the symbolic links in the given pathnames</para>
+          <indexterm zone="ch-system-util-linux-ng namei">
+            <primary sortas="b-namei">namei</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pg">
+        <term><command>pg</command></term>
+        <listitem>
+          <para>Displays a text file one screen full at a time</para>
+          <indexterm zone="ch-system-util-linux-ng pg">
+            <primary sortas="b-pg">pg</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pivot_root">
+        <term><command>pivot_root</command></term>
+        <listitem>
+          <para>Makes the given file system the new root file system of the
+          current process</para>
+          <indexterm zone="ch-system-util-linux-ng pivot_root">
+            <primary sortas="b-pivot_root">pivot_root</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ramsize">
+        <term><command>ramsize</command></term>
+        <listitem>
+          <para>Sets the size of the RAM disk in a bootable image</para>
+          <indexterm zone="ch-system-util-linux-ng ramsize">
+            <primary sortas="b-ramsize">ramsize</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="raw">
+        <term><command>raw</command></term>
+        <listitem>
+          <para>Used to bind a Linux-ng raw character device to a block
+          device</para>
+          <indexterm zone="ch-system-util-linux-ng raw">
+            <primary sortas="b-raw">raw</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rdev">
+        <term><command>rdev</command></term>
+        <listitem>
+          <para>Queries and sets the root device, among other things, in a
+          bootable image</para>
+          <indexterm zone="ch-system-util-linux-ng rdev">
+            <primary sortas="b-rdev">rdev</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="readprofile">
+        <term><command>readprofile</command></term>
+        <listitem>
+          <para>Reads kernel profiling information</para>
+          <indexterm zone="ch-system-util-linux-ng readprofile">
+            <primary sortas="b-readprofile">readprofile</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rename">
+        <term><command>rename</command></term>
+        <listitem>
+          <para>Renames the given files, replacing a given string with
+          another</para>
+          <indexterm zone="ch-system-util-linux-ng rename">
+            <primary sortas="b-rename">rename</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="renice">
+        <term><command>renice</command></term>
+        <listitem>
+          <para>Alters the priority of running processes</para>
+          <indexterm zone="ch-system-util-linux-ng renice">
+            <primary sortas="b-renice">renice</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rev">
+        <term><command>rev</command></term>
+        <listitem>
+          <para>Reverses the lines of a given file</para>
+          <indexterm zone="ch-system-util-linux-ng rev">
+            <primary sortas="b-rev">rev</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rootflags">
+        <term><command>rootflags</command></term>
+        <listitem>
+          <para>Sets the rootflags in a bootable image</para>
+          <indexterm zone="ch-system-util-linux-ng rootflags">
+            <primary sortas="b-rootflags">rootflags</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="script">
+        <term><command>script</command></term>
+        <listitem>
+          <para>Makes a typescript of a terminal session</para>
+          <indexterm zone="ch-system-util-linux-ng script">
+            <primary sortas="b-script">script</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="setfdprm">
+        <term><command>setfdprm</command></term>
+        <listitem>
+          <para>Sets user-provided floppy disk parameters</para>
+          <indexterm zone="ch-system-util-linux-ng setfdprm">
+            <primary sortas="b-setfdprm">setfdprm</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="setsid">
+        <term><command>setsid</command></term>
+        <listitem>
+          <para>Runs the given program in a new session</para>
+          <indexterm zone="ch-system-util-linux-ng setsid">
+            <primary sortas="b-setsid">setsid</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="setterm">
+        <term><command>setterm</command></term>
+        <listitem>
+          <para>Sets terminal attributes</para>
+          <indexterm zone="ch-system-util-linux-ng setterm">
+            <primary sortas="b-setterm">setterm</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="sfdisk">
+        <term><command>sfdisk</command></term>
+        <listitem>
+          <para>A disk partition table manipulator</para>
+          <indexterm zone="ch-system-util-linux-ng sfdisk">
+            <primary sortas="b-sfdisk">sfdisk</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="swapoff">
+        <term><command>swapoff</command></term>
+        <listitem>
+          <para>Disables devices and files for paging and swapping</para>
+          <indexterm zone="ch-system-util-linux-ng swapoff">
+            <primary sortas="b-swapoff">swapoff</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="swapon">
+        <term><command>swapon</command></term>
+        <listitem>
+          <para>Enables devices and files for paging and swapping and
+          lists the devices and files currently in use</para>
+          <indexterm zone="ch-system-util-linux-ng swapon">
+            <primary sortas="b-swapon">swapon</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="tailf">
+        <term><command>tailf</command></term>
+        <listitem>
+          <para>Tracks the growth of a log file. Displays the last 10 lines
+          of a log file, then continues displaying any new entries in the
+          log file as they are created</para>
+          <indexterm zone="ch-system-util-linux-ng tailf">
+            <primary sortas="b-tailf">tailf</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="tunelp">
+        <term><command>tunelp</command></term>
+        <listitem>
+          <para>Tunes the parameters of the line printer</para>
+          <indexterm zone="ch-system-util-linux-ng tunelp">
+            <primary sortas="b-tunelp">tunelp</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ul">
+        <term><command>ul</command></term>
+        <listitem>
+          <para>A filter for translating underscores into escape sequences
+          indicating underlining for the terminal in use</para>
+          <indexterm zone="ch-system-util-linux-ng ul">
+            <primary sortas="b-ul">ul</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="umount">
+        <term><command>umount</command></term>
+        <listitem>
+          <para>Disconnects a file system from the system's file tree</para>
+          <indexterm zone="ch-system-util-linux-ng umount">
+            <primary sortas="b-umount">umount</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="vidmode">
+        <term><command>vidmode</command></term>
+        <listitem>
+          <para>Sets the video mode in a bootable image</para>
+          <indexterm zone="ch-system-util-linux-ng vidmode">
+            <primary sortas="b-vidmode">vidmode</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="whereis">
+        <term><command>whereis</command></term>
+        <listitem>
+          <para>Reports the location of the binary, source, and man page
+          for the given command</para>
+          <indexterm zone="ch-system-util-linux-ng whereis">
+            <primary sortas="b-whereis">whereis</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="write">
+        <term><command>write</command></term>
+        <listitem>
+          <para>Sends a message to the given user <emphasis>if</emphasis> that
+          user has not disabled receipt of such messages</para>
+          <indexterm zone="ch-system-util-linux-ng write">
+            <primary sortas="b-write">write</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: OK/final-system/common/util-linux.xml
===================================================================
--- BOOK/final-system/common/util-linux.xml	(revision ad7417378baa763d31265ce81c3ddae67534da8f)
+++ 	(revision )
@@ -1,820 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-util-linux" role="wrap">
-  <?dbhtml filename="util-linux.html"?>
-
-  <title>Util-linux-&util-linux-version;</title>
-
-  <indexterm zone="ch-system-util-linux">
-    <primary sortas="a-Util-linux">Util-linux</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Util-linux package contains miscellaneous utility programs.
-    Among them are utilities for handling file systems, consoles, partitions,
-    and messages.</para>
-
-
-  </sect2>
-
-  <sect2 id="fhs-util-linux" role="installation">
-    <title>FHS compliance notes</title>
-
-    <para>The FHS recommends using the <filename
-    class="directory">/var/lib/hwclock</filename> directory instead of the
-    usual <filename class="directory">/etc</filename> directory as the
-    location for the <filename>adjtime</filename> file. To make the
-    <command>hwclock</command> program FHS-compliant, run the following:</para>
-
-<screen><userinput>cp hwclock/hwclock.c{,.orig}
-sed 's@etc/adjtime@var/lib/hwclock/adjtime@g' \
-    hwclock/hwclock.c.orig &gt; hwclock/hwclock.c
-mkdir -pv ${CLFS}/var/lib/hwclock</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Util-linux</title>
-
-    <para os="p1">Util-linux fails to compile against newer versions of
-    Linux kernel headers. The following patch properly fixes this issue:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&util-linux-cramfs-patch;</userinput></screen>
-
-    <para os="p3">The following patch fixes build issues the changes to the Linux 2.6.18 headers:</para>
-
-<screen os="p4"><userinput>patch -Np1 -i ../&util-linux-syscall_fixes-patch;</userinput></screen>
-
-   <para os="p5">The following patch fixes swapon.c - it tries to find the
-   variable R_OK, but the header that has R_OK is not included:</para>
-
-<screen os="p6"><userinput>patch -Np1 -i ../&util-linux-missing_header-patch;</userinput></screen>
-
-    <para os="p7">Due to a change in headers some Util-linux will not build.
-    This patch will change the utilization of llseek to lseek. This fix has
-    been applied to the development version of util-linux:</para>
-
-<screen os="p8"><userinput>patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
-
-    <para os="s1">The Util-linux installation uses <option>-o root</option>.
-    As we are currently using an unprivileged user, this will not work. The
-    following <command>sed</command> removes it:</para>
-
-<screen os="s2"><userinput>cp MCONFIG{,.orig}
-sed -e "s/-o root//" MCONFIG.orig > MCONFIG</userinput></screen>
-
-    <para os="a">Prepare Util-linux for compilation:</para>
-
-<screen os="b"><userinput>./configure</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make HAVE_KILL=yes HAVE_SLN=yes \
-CPUOPT="" ARCH="" CPU=""</userinput></screen>
-
-    <variablelist os="e">
-      <title>The meaning of the make parameters:</title>
-
-      <varlistentry os="e1">
-        <term><parameter>HAVE_KILL=yes</parameter></term>
-        <listitem>
-          <para>This prevents the <command>kill</command> program (already
-          installed by Procps) from being built and installed again.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="e2">
-        <term><parameter>HAVE_SLN=yes</parameter></term>
-        <listitem>
-          <para>This prevents the <command>sln</command> program (a
-          statically linked version of <command>ln</command> already installed
-          by Glibc) from being built and installed again.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="e3">
-        <term><parameter>CPUOPT=""</parameter></term>
-        <listitem>
-          <para>This disables any compiler optimizations by CPU type.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="e4">
-        <term><parameter>ARCH=""</parameter></term>
-        <listitem>
-          <para>This disables the detection of the architecture.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="e5">
-        <term><parameter>CPU=""</parameter></term>
-        <listitem>
-          <para>This disables the detection of the CPU.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="f">Install the package and move the <command>logger</command> binary
-    to <filename class="directory">/bin</filename> as it is needed by the
-    CLFS-Bootscripts package:</para>
-
-<screen os="g"><userinput>make HAVE_KILL=yes HAVE_SLN=yes \
-CPUOPT="" ARCH="" CPU="" USE_TTY_GROUP=no DESTDIR=${CLFS} install
-mv -v ${CLFS}/usr/bin/logger ${CLFS}/bin</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-util-linux" role="content">
-    <title>Contents of Util-linux</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>agetty, arch, blockdev, cal, cfdisk, chkdupexe, col, colcrt,
-        colrm, column, ctrlaltdel, cytune, ddate, dmesg, elvtune, fdformat,
-        fdisk, flock, fsck.cramfs, fsck.minix, getopt, hexdump, hwclock, ipcrm,
-        ipcs, isosize, line, logger, look, losetup, mcookie, mkfs, mkfs.bfs,
-        mkfs.cramfs, mkfs.minix, mkswap, more, mount, namei, pg, pivot_root,
-        ramsize (link to rdev), raw, rdev, readprofile, rename, renice, rev,
-        rootflags (link to rdev), script, setfdprm, setsid, setterm, sfdisk,
-        swapoff (link to swapon), swapon, tailf, tunelp, ul, umount, vidmode
-        (link to rdev), whereis, and write</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="agetty">
-        <term><command>agetty</command></term>
-        <listitem>
-          <para>Opens a tty port, prompts for a login name,
-          and then invokes the <command>login</command> program</para>
-          <indexterm zone="ch-system-util-linux agetty">
-            <primary sortas="b-agetty">agetty</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="arch">
-        <term><command>arch</command></term>
-        <listitem>
-          <para>Reports the machine's architecture</para>
-          <indexterm zone="ch-system-util-linux arch">
-            <primary sortas="b-arch">arch</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="blockdev">
-        <term><command>blockdev</command></term>
-        <listitem>
-          <para>Allows users to call block device ioctls from the command
-          line</para>
-          <indexterm zone="ch-system-util-linux blockdev">
-            <primary sortas="b-blockdev">blockdev</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cal">
-        <term><command>cal</command></term>
-        <listitem>
-          <para>Displays a simple calendar</para>
-          <indexterm zone="ch-system-util-linux cal">
-            <primary sortas="b-cal">cal</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cfdisk">
-        <term><command>cfdisk</command></term>
-        <listitem>
-          <para>Manipulates the partition table of the given device</para>
-          <indexterm zone="ch-system-util-linux cfdisk">
-            <primary sortas="b-cfdisk">cfdisk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="chkdupexe">
-        <term><command>chkdupexe</command></term>
-        <listitem>
-          <para>Finds duplicate executables</para>
-          <indexterm zone="ch-system-util-linux chkdupexe">
-            <primary sortas="b-chkdupexe">chkdupexe</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="col">
-        <term><command>col</command></term>
-        <listitem>
-          <para>Filters out reverse line feeds</para>
-          <indexterm zone="ch-system-util-linux col">
-            <primary sortas="b-col">col</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="colcrt">
-        <term><command>colcrt</command></term>
-        <listitem>
-          <para>Filters <command>nroff</command> output for terminals
-          that lack some capabilities, such as overstriking and half-lines</para>
-          <indexterm zone="ch-system-util-linux colcrt">
-            <primary sortas="b-colcrt">colcrt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="colrm">
-        <term><command>colrm</command></term>
-        <listitem>
-          <para>Filters out the given columns</para>
-          <indexterm zone="ch-system-util-linux colrm">
-            <primary sortas="b-colrm">colrm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="column">
-        <term><command>column</command></term>
-        <listitem>
-          <para>Formats a given file into multiple columns</para>
-          <indexterm zone="ch-system-util-linux column">
-            <primary sortas="b-column">column</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ctrlaltdel">
-        <term><command>ctrlaltdel</command></term>
-        <listitem>
-          <para>Sets the function of the Ctrl+Alt+Del key combination to a
-          hard or a soft reset</para>
-          <indexterm zone="ch-system-util-linux ctrlaltdel">
-            <primary sortas="b-ctrlaltdel">ctrlaltdel</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cytune">
-        <term><command>cytune</command></term>
-        <listitem>
-          <para>Tunes the parameters of the serial line drivers for
-          Cyclades cards</para>
-          <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>
-      </varlistentry>
-
-      <varlistentry id="dmesg">
-        <term><command>dmesg</command></term>
-        <listitem>
-          <para>Dumps the kernel boot messages</para>
-          <indexterm zone="ch-system-util-linux dmesg">
-            <primary sortas="b-dmesg">dmesg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="elvtune">
-        <term><command>elvtune</command></term>
-        <listitem>
-          <para>Tunes the performance and interactivity of a block
-          device</para>
-          <indexterm zone="ch-system-util-linux elvtune">
-            <primary sortas="b-elvtune">elvtune</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fdformat">
-        <term><command>fdformat</command></term>
-        <listitem>
-          <para>Low-level formats a floppy disk</para>
-          <indexterm zone="ch-system-util-linux fdformat">
-            <primary sortas="b-fdformat">fdformat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fdisk">
-        <term><command>fdisk</command></term>
-        <listitem>
-          <para>Manipulates the partition table of the given device</para>
-          <indexterm zone="ch-system-util-linux fdisk">
-            <primary sortas="b-fdisk">fdisk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="flock">
-        <term><command>flock</command></term>
-        <listitem>
-          <para>Acquires a file lock and then executes a command with the lock
-          held</para>
-          <indexterm zone="ch-system-util-linux flock">
-            <primary sortas="b-flock">flock</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fsck.cramfs">
-        <term><command>fsck.cramfs</command></term>
-        <listitem>
-          <para>Performs a consistency check on the Cramfs file system on the
-          given device</para>
-          <indexterm zone="ch-system-util-linux fsck.cramfs">
-            <primary sortas="b-fsck.cramfs">fsck.cramfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fsck.minix">
-        <term><command>fsck.minix</command></term>
-        <listitem>
-          <para>Performs a consistency check on the Minix file system on the
-          given device</para>
-          <indexterm zone="ch-system-util-linux fsck.minix">
-            <primary sortas="b-fsck.minix">fsck.minix</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="getopt">
-        <term><command>getopt</command></term>
-        <listitem>
-          <para>Parses options in the given command line</para>
-          <indexterm zone="ch-system-util-linux getopt">
-            <primary sortas="b-getopt">getopt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hexdump">
-        <term><command>hexdump</command></term>
-        <listitem>
-          <para>Dumps the given file in hexadecimal or in another given
-          format</para>
-          <indexterm zone="ch-system-util-linux hexdump">
-            <primary sortas="b-hexdump">hexdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hwclock">
-        <term><command>hwclock</command></term>
-        <listitem>
-          <para>Reads or sets the system's hardware clock, also called
-          the Real-Time Clock (RTC) or Basic Input-Output System (BIOS)
-          clock</para>
-          <indexterm zone="ch-system-util-linux hwclock">
-            <primary sortas="b-hwclock">hwclock</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ipcrm">
-        <term><command>ipcrm</command></term>
-        <listitem>
-          <para>Removes the given Inter-Process Communication (IPC) resource</para>
-          <indexterm zone="ch-system-util-linux ipcrm">
-            <primary sortas="b-ipcrm">ipcrm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ipcs">
-        <term><command>ipcs</command></term>
-        <listitem>
-          <para>Provides IPC status information</para>
-          <indexterm zone="ch-system-util-linux ipcs">
-            <primary sortas="b-ipcs">ipcs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="isosize">
-        <term><command>isosize</command></term>
-        <listitem>
-          <para>Reports the size of an iso9660 file system</para>
-          <indexterm zone="ch-system-util-linux isosize">
-            <primary sortas="b-isosize">isosize</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="line">
-        <term><command>line</command></term>
-        <listitem>
-          <para>Copies a single line</para>
-          <indexterm zone="ch-system-util-linux line">
-            <primary sortas="b-line">line</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="logger">
-        <term><command>logger</command></term>
-        <listitem>
-          <para>Enters the given message into the system log</para>
-          <indexterm zone="ch-system-util-linux logger">
-            <primary sortas="b-logger">logger</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="look">
-        <term><command>look</command></term>
-        <listitem>
-          <para>Displays lines that begin with the given string</para>
-          <indexterm zone="ch-system-util-linux look">
-            <primary sortas="b-look">look</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="losetup">
-        <term><command>losetup</command></term>
-        <listitem>
-          <para>Sets up and controls loop devices</para>
-          <indexterm zone="ch-system-util-linux losetup">
-            <primary sortas="b-losetup">losetup</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mcookie">
-        <term><command>mcookie</command></term>
-        <listitem>
-          <para>Generates magic cookies (128-bit random hexadecimal numbers) for
-          <command>xauth</command></para>
-          <indexterm zone="ch-system-util-linux mcookie">
-            <primary sortas="b-mcookie">mcookie</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mkfs">
-        <term><command>mkfs</command></term>
-        <listitem>
-          <para>Builds a file system on a device (usually a hard disk
-          partition)</para>
-          <indexterm zone="ch-system-util-linux mkfs">
-            <primary sortas="b-mkfs">mkfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mkfs.bfs">
-        <term><command>mkfs.bfs</command></term>
-        <listitem>
-          <para>Creates a Santa Cruz Operations (SCO) bfs file system</para>
-          <indexterm zone="ch-system-util-linux mkfs.bfs">
-            <primary sortas="b-mkfs.bfs">mkfs.bfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mkfs.cramfs">
-        <term><command>mkfs.cramfs</command></term>
-        <listitem>
-          <para>Creates a cramfs file system</para>
-          <indexterm zone="ch-system-util-linux mkfs.cramfs">
-            <primary sortas="b-mkfs.cramfs">mkfs.cramfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mkfs.minix">
-        <term><command>mkfs.minix</command></term>
-        <listitem>
-          <para>Creates a Minix file system</para>
-          <indexterm zone="ch-system-util-linux mkfs.minix">
-            <primary sortas="b-mkfs.minix">mkfs.minix</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mkswap">
-        <term><command>mkswap</command></term>
-        <listitem>
-          <para>Initializes the given device or file to be used as a swap
-          area</para>
-          <indexterm zone="ch-system-util-linux mkswap">
-            <primary sortas="b-mkswap">mkswap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="more">
-        <term><command>more</command></term>
-        <listitem>
-          <para>A filter for paging through text one screen at a time</para>
-          <indexterm zone="ch-system-util-linux more">
-            <primary sortas="b-more">more</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mount">
-        <term><command>mount</command></term>
-        <listitem>
-          <para>Attaches the file system on the given device to a specified
-          directory in the file-system tree</para>
-          <indexterm zone="ch-system-util-linux mount">
-            <primary sortas="b-mount">mount</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="namei">
-        <term><command>namei</command></term>
-        <listitem>
-          <para>Shows the symbolic links in the given pathnames</para>
-          <indexterm zone="ch-system-util-linux namei">
-            <primary sortas="b-namei">namei</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pg">
-        <term><command>pg</command></term>
-        <listitem>
-          <para>Displays a text file one screen full at a time</para>
-          <indexterm zone="ch-system-util-linux pg">
-            <primary sortas="b-pg">pg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pivot_root">
-        <term><command>pivot_root</command></term>
-        <listitem>
-          <para>Makes the given file system the new root file system of the
-          current process</para>
-          <indexterm zone="ch-system-util-linux pivot_root">
-            <primary sortas="b-pivot_root">pivot_root</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ramsize">
-        <term><command>ramsize</command></term>
-        <listitem>
-          <para>Sets the size of the RAM disk in a bootable image</para>
-          <indexterm zone="ch-system-util-linux ramsize">
-            <primary sortas="b-ramsize">ramsize</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="raw">
-        <term><command>raw</command></term>
-        <listitem>
-          <para>Used to bind a Linux raw character device to a block
-          device</para>
-          <indexterm zone="ch-system-util-linux raw">
-            <primary sortas="b-raw">raw</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rdev">
-        <term><command>rdev</command></term>
-        <listitem>
-          <para>Queries and sets the root device, among other things, in a
-          bootable image</para>
-          <indexterm zone="ch-system-util-linux rdev">
-            <primary sortas="b-rdev">rdev</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="readprofile">
-        <term><command>readprofile</command></term>
-        <listitem>
-          <para>Reads kernel profiling information</para>
-          <indexterm zone="ch-system-util-linux readprofile">
-            <primary sortas="b-readprofile">readprofile</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rename">
-        <term><command>rename</command></term>
-        <listitem>
-          <para>Renames the given files, replacing a given string with
-          another</para>
-          <indexterm zone="ch-system-util-linux rename">
-            <primary sortas="b-rename">rename</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="renice">
-        <term><command>renice</command></term>
-        <listitem>
-          <para>Alters the priority of running processes</para>
-          <indexterm zone="ch-system-util-linux renice">
-            <primary sortas="b-renice">renice</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rev">
-        <term><command>rev</command></term>
-        <listitem>
-          <para>Reverses the lines of a given file</para>
-          <indexterm zone="ch-system-util-linux rev">
-            <primary sortas="b-rev">rev</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rootflags">
-        <term><command>rootflags</command></term>
-        <listitem>
-          <para>Sets the rootflags in a bootable image</para>
-          <indexterm zone="ch-system-util-linux rootflags">
-            <primary sortas="b-rootflags">rootflags</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="script">
-        <term><command>script</command></term>
-        <listitem>
-          <para>Makes a typescript of a terminal session</para>
-          <indexterm zone="ch-system-util-linux script">
-            <primary sortas="b-script">script</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="setfdprm">
-        <term><command>setfdprm</command></term>
-        <listitem>
-          <para>Sets user-provided floppy disk parameters</para>
-          <indexterm zone="ch-system-util-linux setfdprm">
-            <primary sortas="b-setfdprm">setfdprm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="setsid">
-        <term><command>setsid</command></term>
-        <listitem>
-          <para>Runs the given program in a new session</para>
-          <indexterm zone="ch-system-util-linux setsid">
-            <primary sortas="b-setsid">setsid</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="setterm">
-        <term><command>setterm</command></term>
-        <listitem>
-          <para>Sets terminal attributes</para>
-          <indexterm zone="ch-system-util-linux setterm">
-            <primary sortas="b-setterm">setterm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sfdisk">
-        <term><command>sfdisk</command></term>
-        <listitem>
-          <para>A disk partition table manipulator</para>
-          <indexterm zone="ch-system-util-linux sfdisk">
-            <primary sortas="b-sfdisk">sfdisk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="swapoff">
-        <term><command>swapoff</command></term>
-        <listitem>
-          <para>Disables devices and files for paging and swapping</para>
-          <indexterm zone="ch-system-util-linux swapoff">
-            <primary sortas="b-swapoff">swapoff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="swapon">
-        <term><command>swapon</command></term>
-        <listitem>
-          <para>Enables devices and files for paging and swapping and
-          lists the devices and files currently in use</para>
-          <indexterm zone="ch-system-util-linux swapon">
-            <primary sortas="b-swapon">swapon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tailf">
-        <term><command>tailf</command></term>
-        <listitem>
-          <para>Tracks the growth of a log file. Displays the last 10 lines
-          of a log file, then continues displaying any new entries in the
-          log file as they are created</para>
-          <indexterm zone="ch-system-util-linux tailf">
-            <primary sortas="b-tailf">tailf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tunelp">
-        <term><command>tunelp</command></term>
-        <listitem>
-          <para>Tunes the parameters of the line printer</para>
-          <indexterm zone="ch-system-util-linux tunelp">
-            <primary sortas="b-tunelp">tunelp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ul">
-        <term><command>ul</command></term>
-        <listitem>
-          <para>A filter for translating underscores into escape sequences
-          indicating underlining for the terminal in use</para>
-          <indexterm zone="ch-system-util-linux ul">
-            <primary sortas="b-ul">ul</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="umount">
-        <term><command>umount</command></term>
-        <listitem>
-          <para>Disconnects a file system from the system's file tree</para>
-          <indexterm zone="ch-system-util-linux umount">
-            <primary sortas="b-umount">umount</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vidmode">
-        <term><command>vidmode</command></term>
-        <listitem>
-          <para>Sets the video mode in a bootable image</para>
-          <indexterm zone="ch-system-util-linux vidmode">
-            <primary sortas="b-vidmode">vidmode</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="whereis">
-        <term><command>whereis</command></term>
-        <listitem>
-          <para>Reports the location of the binary, source, and man page
-          for the given command</para>
-          <indexterm zone="ch-system-util-linux whereis">
-            <primary sortas="b-whereis">whereis</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="write">
-        <term><command>write</command></term>
-        <listitem>
-          <para>Sends a message to the given user <emphasis>if</emphasis> that
-          user has not disabled receipt of such messages</para>
-          <indexterm zone="ch-system-util-linux write">
-            <primary sortas="b-write">write</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: BOOK/final-system/hppa-chapter.xml
===================================================================
--- BOOK/final-system/hppa-chapter.xml	(revision ad7417378baa763d31265ce81c3ddae67534da8f)
+++ BOOK/final-system/hppa-chapter.xml	(revision 3a5c139f2bb226607d62c7d1bf364a9efa2db515)
@@ -59,5 +59,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux-ng.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/aboutdebug.xml"/>
Index: BOOK/final-system/x86-chapter.xml
===================================================================
--- BOOK/final-system/x86-chapter.xml	(revision ad7417378baa763d31265ce81c3ddae67534da8f)
+++ BOOK/final-system/x86-chapter.xml	(revision 3a5c139f2bb226607d62c7d1bf364a9efa2db515)
@@ -59,5 +59,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux-ng.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/aboutdebug.xml"/>
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision ad7417378baa763d31265ce81c3ddae67534da8f)
+++ BOOK/introduction/common/changelog.xml	(revision 3a5c139f2bb226607d62c7d1bf364a9efa2db515)
@@ -40,4 +40,7 @@
       <para>September 9, 2007</para>
       <itemizedlist>
+        <listitem>
+          <para>[jciccone] - Updated to Util-Linux-ng 2.13.</para>
+        </listitem>
         <listitem>
           <para>[jciccone] - Updated Udev to 115.
Index: BOOK/materials/common/packages.xml
===================================================================
--- BOOK/materials/common/packages.xml	(revision ad7417378baa763d31265ce81c3ddae67534da8f)
+++ BOOK/materials/common/packages.xml	(revision 3a5c139f2bb226607d62c7d1bf364a9efa2db515)
@@ -466,9 +466,9 @@
 
     <varlistentry>
-      <term>Util-linux (&util-linux-version;) - <token>&util-linux-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&util-linux-home;"/></para>
-        <para>Download: <ulink url="&util-linux-url;"/></para>
-        <para>MD5 sum: <literal>&util-linux-md5;</literal></para>
+      <term>Util-linux-ng (&util-linux-ng-version;) - <token>&util-linux-ng-size;</token>:</term>
+      <listitem>
+        <para>Home page: <ulink url="&util-linux-ng-home;"/></para>
+        <para>Download: <ulink url="&util-linux-ng-url;"/></para>
+        <para>MD5 sum: <literal>&util-linux-ng-md5;</literal></para>
       </listitem>
     </varlistentry>
Index: BOOK/materials/common/patches.xml
===================================================================
--- BOOK/materials/common/patches.xml	(revision ad7417378baa763d31265ce81c3ddae67534da8f)
+++ BOOK/materials/common/patches.xml	(revision 3a5c139f2bb226607d62c7d1bf364a9efa2db515)
@@ -191,37 +191,4 @@
 
     <varlistentry>
-      <term>Util-linux Cramfs Patch - <token>&util-linux-cramfs-patch-size;</token>:</term> <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&util-linux-cramfs-patch;"/></para>
-        <para>MD5 sum: <literal>&util-linux-cramfs-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Util-linux Syscalls Patch - <token>&util-linux-syscall_fixes-patch-size;</token>:</term> <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&util-linux-syscall_fixes-patch;"/></para>
-        <para>MD5 sum: <literal>&util-linux-syscall_fixes-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry os="util-linux-lseek-patch">
-      <term>Util-linux lseek Patch - <token>&util-linux-lseek-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&util-linux-lseek-patch;"/></para>
-        <para>MD5 sum: <literal>&util-linux-lseek-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Util-linux Missing Header Patch - <token>&util-linux-missing_header-patch-size;</token>:</term> <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&util-linux-missing_header-patch;"/></para>
-        <para>MD5 sum: <literal>&util-linux-missing_header-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term>Vim Cross-Compile Patch - <token>&vim-cross_compile-patch-size;</token>:</term>
       <listitem>
Index: BOOK/packages.ent
===================================================================
--- BOOK/packages.ent	(revision ad7417378baa763d31265ce81c3ddae67534da8f)
+++ BOOK/packages.ent	(revision 3a5c139f2bb226607d62c7d1bf364a9efa2db515)
@@ -304,9 +304,9 @@
 <!ENTITY udev-home "http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html">
 
-<!ENTITY util-linux-version "2.12r">
-<!ENTITY util-linux-size "1,339 KB">
-<!ENTITY util-linux-url "&kernel;linux/utils/util-linux/util-linux-&util-linux-version;.tar.bz2">
-<!ENTITY util-linux-md5 "af9d9e03038481fbf79ea3ac33f116f9">
-<!ENTITY util-linux-home " ">
+<!ENTITY util-linux-ng-version "2.13">
+<!ENTITY util-linux-ng-size "2,652 KB">
+<!ENTITY util-linux-ng-url "&kernel;linux/utils/util-linux-ng/v&util-linux-ng-version;/util-linux-ng-&util-linux-ng-version;.tar.bz2">
+<!ENTITY util-linux-ng-md5 "2175a6e64ba0cf8ff05402eaee33e4b0">
+<!ENTITY util-linux-ng-home " ">
 
 <!ENTITY vim-version "7.1">
Index: BOOK/patches.ent
===================================================================
--- BOOK/patches.ent	(revision ad7417378baa763d31265ce81c3ddae67534da8f)
+++ BOOK/patches.ent	(revision 3a5c139f2bb226607d62c7d1bf364a9efa2db515)
@@ -81,20 +81,4 @@
 <!ENTITY texinfo-tempfile_fix-patch-size "2.2 KB">
 
-<!ENTITY util-linux-cramfs-patch "util-linux-&util-linux-version;-cramfs-1.patch">
-<!ENTITY util-linux-cramfs-patch-md5 "1c3f40b30e12738eb7b66a35b7374572">
-<!ENTITY util-linux-cramfs-patch-size "2.8 KB">
-
-<!ENTITY util-linux-syscall_fixes-patch "util-linux-&util-linux-version;-syscall_fixes-1.patch">
-<!ENTITY util-linux-syscall_fixes-patch-md5 "e1c86c9859c242b300599cef277f03e1">
-<!ENTITY util-linux-syscall_fixes-patch-size "4 KB">
-
-<!ENTITY util-linux-lseek-patch "util-linux-&util-linux-version;-missing_lseek-1.patch">
-<!ENTITY util-linux-lseek-patch-md5 "5d6c86321c1ea74d7ed7cf57861da423">
-<!ENTITY util-linux-lseek-patch-size "12 KB">
- 
-<!ENTITY util-linux-missing_header-patch "util-linux-&util-linux-version;-missing_header-1.patch">
-<!ENTITY util-linux-missing_header-patch-md5 "33ccc15d2e92caa6189b044f573fdcda">
-<!ENTITY util-linux-missing_header-patch-size "1 KB">
-
 <!ENTITY vim-cross_compile-patch "vim-&vim-version;-cross_compile-1.patch">
 <!ENTITY vim-cross_compile-patch-md5 "f8af7a628b58959914390783932c23bc">
Index: tches/util-linux-2.12r-cramfs-1.patch
===================================================================
--- patches/util-linux-2.12r-cramfs-1.patch	(revision ad7417378baa763d31265ce81c3ddae67534da8f)
+++ 	(revision )
@@ -1,93 +1,0 @@
-Submitted by: Jeremy Utley <jeremy@linuxfromscratch.org>
-Date: 2004-12-25
-Initial Package Version: 2.12p (should apply to versions back to at least k)
-Upstream Status: Not Submitted - Test Version
-Origin: Alexander Patrakov, adapted from debian build of cramfs utilities
-Description: Util-Linux fails in cramfs compilation due to changes in the
-linux-libc-headers package 2.6.9 and after.  This patch is a proper fix to the
-problem, but may in fact not be accepted upstream.
-
-
-diff -Naur util-linux-2.12p/disk-utils/fsck.cramfs.c util-linux-2.12p-new/disk-utils/fsck.cramfs.c
---- util-linux-2.12p/disk-utils/fsck.cramfs.c	2004-12-11 14:53:16.000000000 +0000
-+++ util-linux-2.12p-new/disk-utils/fsck.cramfs.c	2004-12-26 00:53:10.665199086 +0000
-@@ -76,16 +76,7 @@
- 
- #define PAD_SIZE 512
- 
--#include <asm/page.h>
--#ifdef PAGE_SIZE
--#define PAGE_CACHE_SIZE ((int) PAGE_SIZE)
--#elif defined __ia64__
--#define PAGE_CACHE_SIZE (16384)
--#elif defined __alpha__
--#define PAGE_CACHE_SIZE (8192)
--#else
--#define PAGE_CACHE_SIZE (4096)
--#endif
-+#define PAGE_CACHE_SIZE  page_size
- 
- /* Guarantee access to at least 8kB at a time */
- #define ROMBUFFER_BITS	13
-@@ -95,11 +86,13 @@
- static unsigned long read_buffer_block = ~0UL;
- 
- /* Uncompressing data structures... */
--static char outbuffer[PAGE_CACHE_SIZE*2];
-+static char *outbuffer;
- z_stream stream;
- 
- #endif /* INCLUDE_FS_TESTS */
- 
-+static size_t page_size;
-+
- /* Input status of 0 to print help and exit without an error. */
- static void usage(int status)
- {
-@@ -464,9 +457,17 @@
- 	int c;			/* for getopt */
- 	int start = 0;
- 
-+	page_size = sysconf(_SC_PAGESIZE);
-+	
- 	if (argc)
- 		progname = argv[0];
- 
-+	outbuffer = malloc(page_size * 2);
-+	if (!outbuffer) {
-+		fprintf(stderr, _("failed to allocate outbuffer\n"));
-+		exit(8);
-+	}
-+
- 	/* command line options */
- 	while ((c = getopt(argc, argv, "hx:v")) != EOF) {
- 		switch (c) {
-diff -Naur util-linux-2.12p/disk-utils/mkfs.cramfs.c util-linux-2.12p-new/disk-utils/mkfs.cramfs.c
---- util-linux-2.12p/disk-utils/mkfs.cramfs.c	2004-12-11 14:56:01.000000000 +0000
-+++ util-linux-2.12p-new/disk-utils/mkfs.cramfs.c	2004-12-26 00:53:10.666198928 +0000
-@@ -46,16 +46,8 @@
- static const char *progname = "mkcramfs";
- static int verbose = 0;
- 
--#ifdef __ia64__
--#define PAGE_CACHE_SIZE (16384)
--#elif defined __alpha__
--#define PAGE_CACHE_SIZE (8192)
--#else
--#define PAGE_CACHE_SIZE (4096)
--#endif
--
- /* The kernel assumes PAGE_CACHE_SIZE as block size. */
--static unsigned int blksize = PAGE_CACHE_SIZE; /* settable via -b option */
-+static unsigned int blksize;                   /* settable via -b option */
- static long total_blocks = 0, total_nodes = 1; /* pre-count the root node */
- static int image_length = 0;
- 
-@@ -730,6 +722,7 @@
- 	u32 crc = crc32(0L, Z_NULL, 0);
- 	int c;
- 
-+	blksize = sysconf(_SC_PAGESIZE);
- 	total_blocks = 0;
- 
- 	if (argc) {
Index: tches/util-linux-2.12r-missing_header-1.patch
===================================================================
--- patches/util-linux-2.12r-missing_header-1.patch	(revision ad7417378baa763d31265ce81c3ddae67534da8f)
+++ 	(revision )
@@ -1,18 +1,0 @@
-Submitted By: Jim Gifford (patches at jg555 dot com)
-Date: 2006-05-30
-Initial Package Version: 2.12r
-Origin: Jim Gifford
-Upstream Status: Sent
-Description: Fixes the missing delcaration of R_OK in swapon.c build
- 
-diff -Naur util-linux-2.12r.orig/mount/swapon.c util-linux-2.12r/mount/swapon.c
---- util-linux-2.12r.orig/mount/swapon.c	2004-12-22 01:50:19.000000000 -0800
-+++ util-linux-2.12r/mount/swapon.c	2006-05-30 00:15:28.979305328 -0700
-@@ -11,6 +11,7 @@
- #include <mntent.h>
- #include <errno.h>
- #include <sys/stat.h>
-+#include <fcntl.h>
- #include "xmalloc.h"
- #include "swap_constants.h"
- #include "swapargs.h"
Index: tches/util-linux-2.12r-missing_lseek-1.patch
===================================================================
--- patches/util-linux-2.12r-missing_lseek-1.patch	(revision ad7417378baa763d31265ce81c3ddae67534da8f)
+++ 	(revision )
@@ -1,272 +1,0 @@
-Submitted By: Dan Nicholson <dbn_dot_lists_at_gmail_dot_com>
-Date: 2006-07-08
-Initial Package Version: 2.12r
-Origin: Upstream
-Upstream Status: Applied in util-linux-2.13-pre6.tar.bz2
-Description: Replaces uses of *llseek with lseek. Fixes an issue
-	compiling util-linux with kernel headers from linux-2.6.18-rc1
-	headers_install.
-
-diff -pur -x '*.rej' util-linux-2.12r.orig/fdisk/Makefile util-linux-2.12r/fdisk/Makefile
---- util-linux-2.12r.orig/fdisk/Makefile	2004-09-06 20:28:58.000000000 +0000
-+++ util-linux-2.12r/fdisk/Makefile	2006-07-08 15:40:57.140375072 +0000
-@@ -39,7 +39,7 @@ else
- endif
- endif
- 
--cfdisk: cfdisk.o llseek.o disksize.o i386_sys_types.o $(LIB)/xstrncpy.o
-+cfdisk: cfdisk.o disksize.o i386_sys_types.o $(LIB)/xstrncpy.o
- ifeq "$(HAVE_SLANG)" "yes"
- 	$(CC) $(LDFLAGS) $^ -o $@ $(LIBSLANG)
- else
-@@ -55,7 +55,7 @@ activate: sfdisk
- 	rm -f activate
- 	ln -s sfdisk activate
- 
--fdisk: fdisk.o llseek.o disksize.o fdiskbsdlabel.o fdisksgilabel.o \
-+fdisk: fdisk.o disksize.o fdiskbsdlabel.o fdisksgilabel.o \
- 	fdisksunlabel.o fdiskaixlabel.o i386_sys_types.o partname.o
- fdisk.o: fdisk.c fdisk.h
- fdiskbsdlabel.o: fdiskbsdlabel.c fdisk.h fdiskbsdlabel.h
-diff -pur -x '*.rej' util-linux-2.12r.orig/fdisk/cfdisk.c util-linux-2.12r/fdisk/cfdisk.c
---- util-linux-2.12r.orig/fdisk/cfdisk.c	2005-09-09 21:44:57.000000000 +0000
-+++ util-linux-2.12r/fdisk/cfdisk.c	2006-07-08 15:40:23.458901045 +0000
-@@ -84,9 +84,6 @@
- #include "xstrncpy.h"
- #include "common.h"
- 
--extern long long ext2_llseek(unsigned int fd, long long offset,
--			     unsigned int origin);
--
- #define VERSION UTIL_LINUX_VERSION
- 
- #define DEFAULT_DEVICE "/dev/hda"
-@@ -552,7 +549,7 @@ die_x(int ret) {
- 
- static void
- read_sector(char *buffer, long long sect_num) {
--    if (ext2_llseek(fd, sect_num*SECTOR_SIZE, SEEK_SET) < 0)
-+    if (lseek(fd, sect_num*SECTOR_SIZE, SEEK_SET) < 0)
- 	fatal(_("Cannot seek on disk drive"), 2);
-     if (read(fd, buffer, SECTOR_SIZE) != SECTOR_SIZE)
- 	fatal(_("Cannot read disk drive"), 2);
-@@ -560,7 +557,7 @@ read_sector(char *buffer, long long sect
- 
- static void
- write_sector(char *buffer, long long sect_num) {
--    if (ext2_llseek(fd, sect_num*SECTOR_SIZE, SEEK_SET) < 0)
-+    if (lseek(fd, sect_num*SECTOR_SIZE, SEEK_SET) < 0)
- 	fatal(_("Cannot seek on disk drive"), 2);
-     if (write(fd, buffer, SECTOR_SIZE) != SECTOR_SIZE)
- 	fatal(_("Cannot write disk drive"), 2);
-@@ -587,7 +584,7 @@ get_dos_label(int i) {
- 	long long offset;
- 
- 	offset = (p_info[i].first_sector + p_info[i].offset) * SECTOR_SIZE;
--	if (ext2_llseek(fd, offset, SEEK_SET) == offset
-+	if (lseek(fd, offset, SEEK_SET) == offset
- 	    && read(fd, &sector, sizeof(sector)) == sizeof(sector)) {
- 		dos_copy_to_info(p_info[i].ostype, OSTYPESZ,
- 				 sector+DOS_OSTYPE_OFFSET, DOS_OSTYPE_SZ);
-@@ -672,7 +669,7 @@ get_linux_label(int i) {
- 
- 	offset = (p_info[i].first_sector + p_info[i].offset) * SECTOR_SIZE
- 		+ 1024;
--	if (ext2_llseek(fd, offset, SEEK_SET) == offset
-+	if (lseek(fd, offset, SEEK_SET) == offset
- 	    && read(fd, &e2fsb, sizeof(e2fsb)) == sizeof(e2fsb)
- 	    && e2fsb.s_magic[0] + (e2fsb.s_magic[1]<<8) == EXT2_SUPER_MAGIC) {
- 		label = e2fsb.s_volume_name;
-@@ -688,7 +685,7 @@ get_linux_label(int i) {
- 	}
- 
- 	offset = (p_info[i].first_sector + p_info[i].offset) * SECTOR_SIZE + 0;
--	if (ext2_llseek(fd, offset, SEEK_SET) == offset
-+	if (lseek(fd, offset, SEEK_SET) == offset
- 	    && read(fd, &xfsb, sizeof(xfsb)) == sizeof(xfsb)
- 	    && !strncmp(xfsb.s_magic, XFS_SUPER_MAGIC, 4)) {
- 		label = xfsb.s_fname;
-@@ -702,7 +699,7 @@ get_linux_label(int i) {
- 	/* jfs? */
- 	offset = (p_info[i].first_sector + p_info[i].offset) * SECTOR_SIZE
- 		+ JFS_SUPER1_OFF;
--	if (ext2_llseek(fd, offset, SEEK_SET) == offset
-+	if (lseek(fd, offset, SEEK_SET) == offset
- 	    && read(fd, &jfsb, sizeof(jfsb)) == sizeof(jfsb)
- 	    && !strncmp(jfsb.s_magic, JFS_MAGIC, strlen(JFS_MAGIC))) {
- 		label = jfsb.s_label;
-@@ -716,7 +713,7 @@ get_linux_label(int i) {
- 	/* reiserfs? */
- 	offset = (p_info[i].first_sector + p_info[i].offset) * SECTOR_SIZE
- 		+ REISERFS_DISK_OFFSET_IN_BYTES;
--	if (ext2_llseek(fd, offset, SEEK_SET) == offset
-+	if (lseek(fd, offset, SEEK_SET) == offset
- 	    && read(fd, &reiserfsb, sizeof(reiserfsb)) == sizeof(reiserfsb)
- 	    && has_reiserfs_magic_string(&reiserfsb, &reiserfs_is_3_6)) {
- 		if (reiserfs_is_3_6) {
-@@ -1860,7 +1857,7 @@ write_part_table(void) {
- 
- 	 while (!done) {
- 	      mvaddstr(COMMAND_LINE_Y, COMMAND_LINE_X,
--		       _("Are you sure you want write the partition table "
-+		       _("Are you sure you want to write the partition table "
- 		       "to disk? (yes or no): "));
- 	      len = get_string(response, LINE_LENGTH, NULL);
- 	      clear_warning();
-diff -pur -x '*.rej' util-linux-2.12r.orig/fdisk/fdisk.c util-linux-2.12r/fdisk/fdisk.c
---- util-linux-2.12r.orig/fdisk/fdisk.c	2004-12-18 02:00:31.000000000 +0000
-+++ util-linux-2.12r/fdisk/fdisk.c	2006-07-08 15:40:23.461899841 +0000
-@@ -239,8 +239,8 @@ void fatal(enum failure why) {
- 
- static void
- seek_sector(int fd, unsigned int secno) {
--	long long offset = (long long) secno * sector_size;
--	if (ext2_llseek(fd, offset, SEEK_SET) == (long long) -1)
-+	off_t offset = (off_t) secno * sector_size;
-+	if (lseek(fd, offset, SEEK_SET) == (off_t) -1)
- 		fatal(unable_to_seek);
- }
- 
-diff -pur -x '*.rej' util-linux-2.12r.orig/fdisk/fdisk.h util-linux-2.12r/fdisk/fdisk.h
---- util-linux-2.12r.orig/fdisk/fdisk.h	2004-12-15 18:19:06.000000000 +0000
-+++ util-linux-2.12r/fdisk/fdisk.h	2006-07-08 15:40:23.462899439 +0000
-@@ -26,9 +26,6 @@
- #define cround(n)	(display_in_cyl_units ? ((n)/units_per_sector)+1 : (n))
- #define scround(x)	(((x)+units_per_sector-1)/units_per_sector)
- 
--extern long long ext2_llseek(unsigned int fd, long long offset,
--			     unsigned int origin);
--
- #if defined(__GNUC__) && (defined(__arm__) || defined(__alpha__))
- # define PACKED __attribute__ ((packed))
- #else
-diff -pur -x '*.rej' util-linux-2.12r.orig/fdisk/fdiskbsdlabel.c util-linux-2.12r/fdisk/fdiskbsdlabel.c
---- util-linux-2.12r.orig/fdisk/fdiskbsdlabel.c	2003-07-13 21:12:47.000000000 +0000
-+++ util-linux-2.12r/fdisk/fdiskbsdlabel.c	2006-07-08 15:40:23.463899038 +0000
-@@ -566,7 +566,7 @@ xbsd_write_bootstrap (void)
-   sector = get_start_sect(xbsd_part);
- #endif
- 
--  if (ext2_llseek (fd, (long long) sector * SECTOR_SIZE, SEEK_SET) == -1)
-+  if (lseek (fd, (off_t) sector * SECTOR_SIZE, SEEK_SET) == -1)
-     fatal (unable_to_seek);
-   if (BSD_BBSIZE != write (fd, disklabelbuffer, BSD_BBSIZE))
-     fatal (unable_to_write);
-@@ -735,7 +735,7 @@ xbsd_readlabel (struct partition *p, str
- 	sector = 0;
- #endif
- 
--	if (ext2_llseek (fd, (long long) sector * SECTOR_SIZE, SEEK_SET) == -1)
-+	if (lseek (fd, (off_t) sector * SECTOR_SIZE, SEEK_SET) == -1)
- 		fatal (unable_to_seek);
- 	if (BSD_BBSIZE != read (fd, disklabelbuffer, BSD_BBSIZE))
- 		fatal (unable_to_read);
-@@ -781,12 +781,12 @@ xbsd_writelabel (struct partition *p, st
- 
- #if defined (__alpha__) && BSD_LABELSECTOR == 0
-   alpha_bootblock_checksum (disklabelbuffer);
--  if (ext2_llseek (fd, (long long) 0, SEEK_SET) == -1)
-+  if (lseek (fd, (off_t) 0, SEEK_SET) == -1)
-     fatal (unable_to_seek);
-   if (BSD_BBSIZE != write (fd, disklabelbuffer, BSD_BBSIZE))
-     fatal (unable_to_write);
- #else
--  if (ext2_llseek (fd, (long long) sector * SECTOR_SIZE + BSD_LABELOFFSET,
-+  if (lseek (fd, (off_t) sector * SECTOR_SIZE + BSD_LABELOFFSET,
- 		   SEEK_SET) == -1)
-     fatal (unable_to_seek);
-   if (sizeof (struct xbsd_disklabel) != write (fd, d, sizeof (struct xbsd_disklabel)))
-diff -pur -x '*.rej' util-linux-2.12r.orig/fdisk/fdisksgilabel.c util-linux-2.12r/fdisk/fdisksgilabel.c
---- util-linux-2.12r.orig/fdisk/fdisksgilabel.c	2004-12-18 01:53:45.000000000 +0000
-+++ util-linux-2.12r/fdisk/fdisksgilabel.c	2006-07-08 15:40:23.464898637 +0000
-@@ -379,7 +379,7 @@ sgi_write_table(void) {
- 		 */
- 		sgiinfo *info = fill_sgiinfo();
- 		int infostartblock = SSWAP32(sgilabel->directory[0].vol_file_start);
--		if (ext2_llseek(fd, (long long)infostartblock*
-+		if (lseek(fd, (off_t) infostartblock*
- 				SECTOR_SIZE, SEEK_SET) < 0)
- 			fatal(unable_to_seek);
- 		if (write(fd, info, SECTOR_SIZE) != SECTOR_SIZE)
-diff -pur -x '*.rej' util-linux-2.12r.orig/fdisk/sfdisk.c util-linux-2.12r/fdisk/sfdisk.c
---- util-linux-2.12r.orig/fdisk/sfdisk.c	2005-01-04 22:31:57.000000000 +0000
-+++ util-linux-2.12r/fdisk/sfdisk.c	2006-07-08 15:40:23.467897432 +0000
-@@ -164,36 +164,17 @@ fatal(char *s, ...) {
- /*
-  * sseek: seek to specified sector - return 0 on failure
-  *
-- * For >4GB disks lseek needs a > 32bit arg, and we have to use llseek.
-- * On the other hand, a 32 bit sector number is OK until 2TB.
-- * The routines _llseek and sseek below are the only ones that
-- * know about the loff_t type.
-- *
-  * Note: we use 512-byte sectors here, irrespective of the hardware ss.
-  */
--#undef use_lseek
--#if defined (__alpha__) || defined (__ia64__) || defined (__x86_64__) || defined (__s390x__)
--#define use_lseek
--#endif
--
--#ifndef use_lseek
--static __attribute__used
--_syscall5(int,  _llseek,  unsigned int,  fd, ulong, hi, ulong, lo,
--       loff_t *, res, unsigned int, wh);
--#endif
- 
- static int
- sseek(char *dev, unsigned int fd, unsigned long s) {
--    loff_t in, out;
--    in = ((loff_t) s << 9);
-+    off_t in, out;
-+    in = ((off_t) s << 9);
-     out = 1;
- 
--#ifndef use_lseek
--    if (_llseek (fd, in>>32, in & 0xffffffff, &out, SEEK_SET) != 0) {
--#else
-     if ((out = lseek(fd, in, SEEK_SET)) != in) {
--#endif
--	perror("llseek");
-+	perror("lseek");
- 	error(_("seek error on %s - cannot seek to %lu\n"), dev, s);
- 	return 0;
-     }
-diff -pur -x '*.rej' util-linux-2.12r.orig/partx/partx.c util-linux-2.12r/partx/partx.c
---- util-linux-2.12r.orig/partx/partx.c	2004-08-23 20:13:27.000000000 +0000
-+++ util-linux-2.12r/partx/partx.c	2006-07-08 15:40:23.469896630 +0000
-@@ -330,34 +330,15 @@ xmalloc (size_t size) {
- 	return t;
- }
- 
--/*
-- * sseek: seek to specified sector
-- */
--#if !defined (__alpha__) && !defined (__ia64__) && !defined (__s390x__) && !defined(__x86_64__)
--#define NEED__llseek
--#endif
--
--#ifdef NEED__llseek
--#include <linux/unistd.h>       /* _syscall */
--static
--_syscall5(int,  _llseek,  uint,  fd, ulong, hi, ulong, lo,
--	  long long *, res, uint, wh);
--#endif
--
- static int
- sseek(int fd, unsigned int secnr) {
- 	long long in, out;
- 	in = ((long long) secnr << 9);
- 	out = 1;
- 
--#ifdef NEED__llseek
--	if (_llseek (fd, in>>32, in & 0xffffffff, &out, SEEK_SET) != 0
--	    || out != in)
--#else
- 	if ((out = lseek(fd, in, SEEK_SET)) != in)
--#endif
- 	{
--		fprintf(stderr, "llseek error\n");
-+		fprintf(stderr, "lseek error\n");
- 		return -1;
- 	}
- 	return 0;
Index: tches/util-linux-2.12r-syscall_fixes-1.patch
===================================================================
--- patches/util-linux-2.12r-syscall_fixes-1.patch	(revision ad7417378baa763d31265ce81c3ddae67534da8f)
+++ 	(revision )
@@ -1,76 +1,0 @@
-Submitted By: Jim Gifford (patches at jg555 dot com)
-Date: 2006-09-30
-Initial Package Version: 2.12r
-Origin: Joe Ciccone and Ryan Oliver
-Upstream Status: Sent
-Description: Fixes Missing Syscalls from the new 2.6.18 headers
- 
-diff -Naur util-linux-2.12r.orig/mount/swapon.c util-linux-2.12r/mount/swapon.c
---- util-linux-2.12r.orig/mount/swapon.c	2004-12-22 01:50:19.000000000 -0800
-+++ util-linux-2.12r/mount/swapon.c	2006-09-30 19:53:01.110866713 -0700
-@@ -75,25 +75,6 @@
- #define SWAPON_NEEDS_TWO_ARGS
- #endif
- 
--#ifdef SWAPON_NEEDS_TWO_ARGS
--#ifdef SWAPON_HAS_TWO_ARGS
--/* libc is OK */
--#include <unistd.h>
--#else
--/* We want a swapon with two args, but have an old libc.
--   Build the kernel call by hand. */
--#include <linux/unistd.h>
--static
--_syscall2(int,  swapon,  const char *,  path, int, flags);
--static
--_syscall1(int,  swapoff,  const char *,  path);
--#endif
--#else
--/* just do as libc says */
--#include <unistd.h>
--#endif
--
--
- /*
-  * contents of /proc/swaps
-  */
-diff -Naur util-linux-2.12r.orig/mount/umount.c util-linux-2.12r/mount/umount.c
---- util-linux-2.12r.orig/mount/umount.c	2005-09-10 11:07:38.000000000 -0700
-+++ util-linux-2.12r/mount/umount.c	2006-09-30 19:50:28.619968401 -0700
-@@ -31,36 +31,11 @@
- #include <arpa/inet.h>
- #endif
- 
--#if defined(MNT_FORCE) && !defined(__sparc__) && !defined(__arm__)
--/* Interesting ... it seems libc knows about MNT_FORCE and presumably
--   about umount2 as well -- need not do anything */
--#else /* MNT_FORCE */
--
--/* Does the present kernel source know about umount2? */
--#include <linux/unistd.h>
--#ifdef __NR_umount2
--
--static int umount2(const char *path, int flags);
--
--_syscall2(int, umount2, const char *, path, int, flags);
--
--#else /* __NR_umount2 */
--
--static int
--umount2(const char *path, int flags) {
--	fprintf(stderr, _("umount: compiled without support for -f\n"));
--	errno = ENOSYS;
--	return -1;
--}
--#endif /* __NR_umount2 */
--
- #if !defined(MNT_FORCE)
- /* dare not try to include <linux/mount.h> -- lots of errors */
- #define MNT_FORCE 1
- #endif
- 
--#endif /* MNT_FORCE */
--
- #if !defined(MNT_DETACH)
- #define MNT_DETACH 2
- #endif
