Begin adjusting book for Systemd. libcap2 is actually libcap - Debian uses strange naming for source packages. Add Sysvinit back - only few programs are needed from the package. Remove Sysklogd. Add adm group to grups in chapter06. It's necesary by something in Systemd. Change /etc/mtab to link to /proc/self/mounts. Relocate packages order.

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

11 files changed, 227 insertions, 249 deletions

diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index ff263333d..21978454e 100644
--- a/appendices/dependencies.xml
+++ b/appendices/dependencies.xml
@@ -29,7 +29,7 @@
   built in a certain order, this could result in paths of /tools/bin/[binary]
   being placed inside scripts installed to the final system. This is obviously
   not desirable.</para>
-
+  
   <para>The last list of dependencies are optional packages that are not
   addressed in LFS, but could be useful to the user.  These packages may have
   additional mandatory or optional dependencies of their own.  For these
@@ -324,42 +324,6 @@
         </seglistitem>
       </segmentedlist>
 
-<!-- Begin D-Bus dependency info -->
-  <bridgehead renderas="sect2" id="dbus-dep">D-Bus</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Coreutils, Diffutils, Expat, GCC, Grep, Make, and
-         Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>D-Bus Glib Bindings, Python</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Systemd</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&external;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
 <!-- Begin Diffutils dependency info -->
   <bridgehead renderas="sect2" id="diffutils-dep">Diffutils</bridgehead>
 
@@ -873,7 +837,7 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Bison, Coreutils, Diffutils, GCC, Gettext, Glibc,
+         <seg>Bash, Binutils, Bison, Coreutils, Diffutils, GCC, Gettext, Glibc, 
          Grep, Make, Ncurses, Sed, Texinfo, and Xz</seg>
         </seglistitem>
       </segmentedlist>
@@ -1591,7 +1555,7 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Make,
+         <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Make, 
          Popt, and Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -1620,41 +1584,6 @@
         </seglistitem>
       </segmentedlist>
 
-<!-- Begin Popt dependency info -->
-  <bridgehead renderas="sect2" id="popt-dep">Popt</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Make</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Diffutils and Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Pkg-config</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&external;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
 <!-- Begin Procps dependency info -->
   <bridgehead renderas="sect2" id="procps-dep">Procps-ng</bridgehead>
 
@@ -1834,41 +1763,6 @@
         </seglistitem>
       </segmentedlist>
 
-<!-- Begin Sysklogd dependency info -->
-  <bridgehead renderas="sect2" id="sysklogd-dep">Sysklogd</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Binutils, Coreutils, GCC, Glibc, Make, and Patch</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No test suite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&external;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
 <!-- Begin Sysvinit dependency info -->
   <bridgehead renderas="sect2" id="sysvinit-dep">Sysvinit</bridgehead>
 
@@ -2012,42 +1906,6 @@
         </seglistitem>
       </segmentedlist>
 
-<!-- Begin Udev dependency info -->
-  <bridgehead renderas="sect2" id="udev-dep">Udev</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
-         Kmod, Make, and Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No test suite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&external;</segtitle>
-
-        <seglistitem>
-          <seg>Glib, Pci-Utils, Python, Systemd, USB-Utils</seg>
-        </seglistitem>
-      </segmentedlist>
-
 <!-- Begin Util-linux dependency info -->
   <bridgehead renderas="sect2" id="util-linux-dep">Util-linux</bridgehead>
 
@@ -2120,41 +1978,6 @@
         </seglistitem>
       </segmentedlist>
 
-<!-- Begin Xml-Parser dependency info -->
-  <bridgehead renderas="sect2" id="xml-parser-dep">Xml::Parser</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Expat, Make, and Perl.</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Intltool</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&external;</segtitle>
-
-        <seglistitem>
-          <seg>libwww-perl</seg>
-        </seglistitem>
-      </segmentedlist>
-
 <!-- Begin Xz-utils dependency info -->
   <bridgehead renderas="sect2" id="xz-dep">Xz</bridgehead>
 
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 7591272e5..d2892ba28 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -35,6 +35,23 @@
       </itemizedlist>
     </listitem>
 -->
+
+    <listitem>
+      <para>2013-02-15</para>
+      <itemizedlist>
+        <listitem>
+          <para>Move newly added components into place.</para>
+        </listitem>
+        <listitem>  
+          <para>Removed Sysklogd-1.5. Journald will be used for logging.</para>
+        </listitem>
+        <listitem>  
+          <para>Re-add Sysvinit package. Few programs are needed from the
+          package.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2013-02-13</para>
       <itemizedlist>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 462bf7511..b17f7e5b5 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -269,7 +269,7 @@
     </listitem>
 
     <listitem>
-      <para>Libcap2-&libcap2-version;</para>
+      <para>Libcap-&libcap-version;</para>
     </listitem>
 
     <listitem>
@@ -345,6 +345,14 @@
       <para>sed-4.2.1-testsuite_fixes-1.patch</para>
     </listitem>
 
+    <listitem>
+      <para>Sysklogd-1.5</para>
+    </listitem>
+
+    <listitem>
+      <para>Udev-197</para>
+    </listitem>
+
   </itemizedlist>
 
 </sect1>
diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index 47b3b3888..f0a987f29 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -357,11 +357,11 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Libcap2 (&libcap2-version;) - <token>&libcap2-size;</token>:</term>
+      <term>Libcap2 (&libcap-version;) - <token>&libcap-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink url="&libcap2-home;"/></para>
-        <para>Download: <ulink url="&libcap2-url;"/></para>
-        <para>MD5 sum: <literal>&libcap2-md5;</literal></para>
+        <para>Home page: <ulink url="&libcap-home;"/></para>
+        <para>Download: <ulink url="&libcap-url;"/></para>
+        <para>MD5 sum: <literal>&libcap-md5;</literal></para>
       </listitem>
     </varlistentry>
 
@@ -568,11 +568,11 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Sysklogd (&sysklogd-version;) - <token>&sysklogd-size;</token>:</term>
+      <term>Sysvinit (&sysvinit-version;) - <token>&sysvinit-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink url="&sysklogd-home;"/></para>
-        <para>Download: <ulink url="&sysklogd-url;"/></para>
-        <para>MD5 sum: <literal>&sysklogd-md5;</literal></para>
+        <para>Home page: <ulink url="&sysvinit-home;"/></para>
+        <para>Download: <ulink url="&sysvinit-url;"/></para>
+        <para>MD5 sum: <literal>&sysvinit-md5;</literal></para>
       </listitem>
     </varlistentry>
 
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index 44abca407..ae03b48c0 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -37,6 +37,8 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="procps.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shadow.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="attr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iana-etc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="m4.xml"/>
@@ -49,15 +51,15 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="expat.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="inetutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="attr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xml-parser.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="automake.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dbus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="diffutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gawk.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="findutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="flex.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gettext.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="intltool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gperf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="groff.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xz.xml"/>
@@ -67,14 +69,12 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iproute2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kmod.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcap2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libpipeline.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="man-db.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysklogd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xml-parser.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="intltool.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dbus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="texinfo.xml"/>
diff --git a/chapter06/createfiles.xml b/chapter06/createfiles.xml
index 7f32e89b6..e95a76585 100644
--- a/chapter06/createfiles.xml
+++ b/chapter06/createfiles.xml
@@ -47,12 +47,10 @@ sed 's/tools/usr/' /tools/lib/libstdc++.la > /usr/lib/libstdc++.la
 ln -sv bash /bin/sh</userinput></screen>
 
   <para>A proper Linux system maintains a list of the mounted file systems in
-  the file <filename>/etc/mtab</filename>.  Normally, this file would be
-  created when we mount a new file system. Since we will not be mounting any
-  file systems inside our chroot environment, create an empty file for
-  utilities that expect the presence of <filename>/etc/mtab</filename>:</para>
+  the file <filename>/etc/mtab</filename>. Systemd requires it to be a
+  symbolic link to  <filename>/proc/self/mounts</filename>:</para>
 
-<screen><userinput>touch /etc/mtab</userinput></screen>
+<screen><userinput>ln -s /proc/self/mounts /etc/mtab</userinput></screen>
 
   <para>In order for user <systemitem class="username">root</systemitem> to be
   able to login and for the name <quote>root</quote> to be recognized, there
@@ -91,6 +89,7 @@ video:x:12:
 utmp:x:13:
 usb:x:14:
 cdrom:x:15:
+adm:x:16:
 mail:x:34:
 nogroup:x:99:</literal>
 EOF</userinput></screen>
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index e3f0f50d5..12fa8b417 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -176,8 +176,8 @@ cp -v ../glibc-&glibc-version;/nis/rpcsvc/*.h /usr/include/rpcsvc</userinput></s
     <para>Install the configuration file and runtime directory for
     <command>nscd</command>:</para>
 
-<screen><userinput remap="install">install -v -m644 ../glibc-&glibc-version;/nscd/nscd.conf /etc/nscd.conf &amp;&amp;
-install -v -dm755 /var/cache/nscd</userinput></screen>
+<screen><userinput remap="install">cp -v ../glibc-&glibc-version;/nscd/nscd.conf /etc/nscd.conf &amp;&amp;
+mkdir -pv /var/cache/nscd</userinput></screen>
 
     <para>The locales that can make the system respond in a different language
     were not installed by the above command. None of the locales are required,
@@ -411,7 +411,7 @@ EOF</userinput></screen>
 include /etc/ld.so.conf.d/*.conf
 </literal>
 EOF
-mkdir /etc/ld.so.conf.d</userinput></screen>
+mkdir -pv /etc/ld.so.conf.d</userinput></screen>
 
   </sect2>
 
diff --git a/chapter06/libcap2.xml b/chapter06/libcap.xml
index ccff9ada1..4e3b9ab38 100644
--- a/chapter06/libcap2.xml
+++ b/chapter06/libcap.xml
@@ -5,25 +5,25 @@
   %general-entities;
 ]>
 
-<sect1 id="ch-system-libcap2" role="wrap">
-  <?dbhtml filename="libcap2.html"?>
+<sect1 id="ch-system-libcap" role="wrap">
+  <?dbhtml filename="libcap.html"?>
 
   <sect1info condition="script">
-    <productname>libcap2</productname>
-    <productnumber>&libcap2-version;</productnumber>
-    <address>&libcap2-url;</address>
+    <productname>libcap</productname>
+    <productnumber>&libcap-version;</productnumber>
+    <address>&libcap-url;</address>
   </sect1info>
 
-  <title>Libcap2-&libcap2-version;</title>
+  <title>Libcap2-&libcap-version;</title>
 
-  <indexterm zone="ch-system-libcap2">
-    <primary sortas="a-Libcap2">Libcap2</primary>
+  <indexterm zone="ch-system-libcap">
+    <primary sortas="a-Libcap">Libcap</primary>
   </indexterm>
 
   <sect2 role="package">
     <title/>
 
-    <para>The Libcap2 package implements the user-space interfaces to the POSIX
+    <para>The Libcap package implements the user-space interfaces to the POSIX
     1003.1e capabilities available in Linux kernels. These capabilities are a
     partitioning of the all powerful root privilege into a set of distinct
     privileges.</para>
@@ -33,15 +33,15 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&libcap2-ch6-sbu;</seg>
-        <seg>&libcap2-ch6-du;</seg>
+        <seg>&libcap-ch6-sbu;</seg>
+        <seg>&libcap-ch6-du;</seg>
       </seglistitem>
     </segmentedlist>
 
   </sect2>
 
   <sect2 role="installation">
-    <title>Installation of Libcap2</title>
+    <title>Installation of Libcap</title>
 
     <para>Compile the package:</para>
 
@@ -55,8 +55,8 @@
 
   </sect2>
 
-  <sect2 id="contents-libcap2" role="content">
-    <title>Contents of Libcap2</title>
+  <sect2 id="contents-libcap" role="content">
+    <title>Contents of Libcap</title>
 
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
@@ -64,7 +64,7 @@
 
       <seglistitem>
         <seg>capsh, getcap, getpcaps, and setcap</seg>
-        <seg>libcap2.{so,a}</seg>
+        <seg>libcap.{so,a}</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -77,7 +77,7 @@
         <term><command>capsh</command></term>
         <listitem>
           <para>A shell wrapper to explore and constrain capability support</para>
-          <indexterm zone="ch-system-libcap2 capsh">
+          <indexterm zone="ch-system-libcap capsh">
             <primary sortas="b-capsh">capsh</primary>
           </indexterm>
         </listitem>
@@ -87,7 +87,7 @@
         <term><command>getcap</command></term>
         <listitem>
           <para>Examines file capabilities</para>
-          <indexterm zone="ch-system-libcap2 getcap">
+          <indexterm zone="ch-system-libcap getcap">
             <primary sortas="b-getcap">getcap</primary>
           </indexterm>
         </listitem>
@@ -97,18 +97,18 @@
         <term><command>getpcaps</command></term>
         <listitem>
           <para>Displays the capabilities on the queried process(es)</para>
-          <indexterm zone="ch-system-libcap2 getpcaps">
+          <indexterm zone="ch-system-libcap getpcaps">
             <primary sortas="b-getpcaps">getpcaps</primary>
           </indexterm>
         </listitem>
       </varlistentry>
 
-      <varlistentry id="libcap2">
-        <term><filename class="libraryfile">libcap2.{so,a}</filename></term>
+      <varlistentry id="libcap">
+        <term><filename class="libraryfile">libcap.{so,a}</filename></term>
         <listitem>
-          <para>Contains the libcap2 API functions</para>
-          <indexterm zone="ch-system-libcap2 libcap2">
-            <primary sortas="c-libcap2">libcap2</primary>
+          <para>Contains the libcap API functions</para>
+          <indexterm zone="ch-system-libcap libcap">
+            <primary sortas="c-libcap">libcap</primary>
           </indexterm>
         </listitem>
       </varlistentry>
diff --git a/chapter06/sysvinit.xml b/chapter06/sysvinit.xml
new file mode 100644
index 000000000..8b114e780
--- /dev/null
+++ b/chapter06/sysvinit.xml
@@ -0,0 +1,133 @@
+<?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-sysvinit" role="wrap">
+  <?dbhtml filename="sysvinit.html"?>
+
+  <sect1info condition="script">
+    <productname>sysvinit</productname>
+    <productnumber>&sysvinit-version;</productnumber>
+    <address>&sysvinit-url;</address>
+  </sect1info>
+
+  <title>Sysvinit-&sysvinit-version;</title>
+
+  <indexterm zone="ch-system-sysvinit">
+    <primary sortas="a-Sysvinit">Sysvinit</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>The Sysvinit package contains programs for controlling the startup,
+    running, and shutdown of the system.</para>
+
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
+
+      <seglistitem>
+        <seg>&sysvinit-ch6-sbu;</seg>
+        <seg>&sysvinit-ch6-du;</seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Sysvinit</title>
+
+    <para>Compile the package:</para>
+
+<screen><userinput remap="make">make -C src</userinput></screen>
+
+    <para>This package does not come with a test suite.</para>
+
+    <para>Install the package:</para>
+
+<screen><userinput remap="install">make -C src install</userinput></screen>
+
+  </sect2>
+
+  <sect2 id="contents-sysvinit" role="content">
+    <title>Contents of Sysvinit</title>
+
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+
+      <seglistitem>
+        <seg>fstab-decode, killall5, last,
+        lastb (link to last) and pidof
+        (link to killall5)</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="fstab-decode">
+        <term><command>fstab-decode</command></term>
+        <listitem>
+          <para>Run a command with fstab-encoded arguments</para>
+          <indexterm zone="ch-system-sysvinit fstab-decode">
+            <primary sortas="b-fstab-decode">fstab-decode</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="killall5">
+        <term><command>killall5</command></term>
+        <listitem>
+          <para>Sends a signal to all processes, except the processes in its own
+          session so it will not kill the shell running the script that called
+          it</para>
+          <indexterm zone="ch-system-sysvinit killall5">
+            <primary sortas="b-killall5">killall5</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="last">
+        <term><command>last</command></term>
+        <listitem>
+          <para>Shows which users last logged in (and out), searching back
+          through the <filename>/var/log/wtmp</filename> file; it also shows
+          system boots, shutdowns, and run-level changes</para>
+          <indexterm zone="ch-system-sysvinit last">
+            <primary sortas="b-last">last</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="lastb">
+        <term><command>lastb</command></term>
+        <listitem>
+          <para>Shows the failed login attempts, as logged in
+          <filename>/var/log/btmp</filename></para>
+          <indexterm zone="ch-system-sysvinit lastb">
+            <primary sortas="b-lastb">lastb</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pidof">
+        <term><command>pidof</command></term>
+        <listitem>
+          <para>Reports the PIDs of the given programs</para>
+          <indexterm zone="ch-system-sysvinit pidof">
+            <primary sortas="b-pidof">pidof</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
diff --git a/packages.ent b/packages.ent
index 156e3b379..ae415f7d8 100644
--- a/packages.ent
+++ b/packages.ent
@@ -350,13 +350,13 @@
 <!ENTITY lfs-bootscripts-ch7-du "BOOTSCRIPTS-INSTALL-KB KB"> <!-- Updated in Makefile -->
 <!ENTITY lfs-bootscripts-ch7-sbu "less than 0.1 SBU">
 
-<!ENTITY libcap2-version "2.22">
-<!ENTITY libcap2-size "66 KB">
-<!ENTITY libcap2-url "http://ftp.de.debian.org/debian/pool/main/libc/libcap2/libcap2_&libcap2-version;.orig.tar.gz">
-<!ENTITY libcap2-md5 "b4896816b626bea445f0b3849bdd4077">
-<!ENTITY libcap2-home " ">
-<!ENTITY libcap2-ch6-du "1.3 MB">
-<!ENTITY libcap2-ch6-sbu "0.1 SBU">
+<!ENTITY libcap-version "2.22">
+<!ENTITY libcap-size "66 KB">
+<!ENTITY libcap-url "http://ftp.de.debian.org/debian/pool/main/libc/libcap/libcap_&libcap-version;.orig.tar.gz">
+<!ENTITY libcap-md5 "b4896816b626bea445f0b3849bdd4077">
+<!ENTITY libcap-home " ">
+<!ENTITY libcap-ch6-du "1.3 MB">
+<!ENTITY libcap-ch6-sbu "0.1 SBU">
 
 <!ENTITY libpipeline-version "1.2.2">
 <!ENTITY libpipeline-size "733 KB">
@@ -527,14 +527,6 @@
 <!ENTITY shadow-ch6-du "42 MB">
 <!ENTITY shadow-ch6-sbu "0.2 SBU">
 
-<!ENTITY sysklogd-version "1.5">
-<!ENTITY sysklogd-size "85 KB">
-<!ENTITY sysklogd-url "http://www.infodrom.org/projects/sysklogd/download/sysklogd-&sysklogd-version;.tar.gz">
-<!ENTITY sysklogd-md5 "e053094e8103165f98ddafe828f6ae4b">
-<!ENTITY sysklogd-home "http://www.infodrom.org/projects/sysklogd/">
-<!ENTITY sysklogd-ch6-du "0.6 MB">
-<!ENTITY sysklogd-ch6-sbu "less than 0.1 SBU">
-
 <!ENTITY systemd-version "197">
 <!ENTITY systemd-size    "2,012 KB">
 <!ENTITY systemd-url     "http://www.freedesktop.org/software/systemd/systemd-&systemd-version;.tar.xz">
@@ -543,6 +535,14 @@
 <!ENTITY systemd-ch6-du  "23 MB">
 <!ENTITY systemd-ch6-sbu "0.1 SBU">
 
+<!ENTITY sysvinit-version "2.88dsf">
+<!ENTITY sysvinit-size "108 KB">
+<!ENTITY sysvinit-url "http://download.savannah.gnu.org/releases/sysvinit/sysvinit-&sysvinit-version;.tar.bz2">
+<!ENTITY sysvinit-md5 "6eda8a97b86e0a6f59dabbf25202aa6f">
+<!ENTITY sysvinit-home "http://savannah.nongnu.org/projects/sysvinit">
+<!ENTITY sysvinit-ch6-du "1.4 MB">
+<!ENTITY sysvinit-ch6-sbu "less than 0.1 SBU">
+
 <!ENTITY tar-version "1.26">
 <!ENTITY tar-size "2,285 KB">
 <!ENTITY tar-url "&gnu;tar/tar-&tar-version;.tar.bz2">
diff --git a/prologue/why.xml b/prologue/why.xml
index 3d487660a..c61fbfd89 100644
--- a/prologue/why.xml
+++ b/prologue/why.xml
@@ -24,7 +24,7 @@
         <para>Attr</para>
 
         <para>This package contains programs for working with extended
-        attributes on filesystem objects.  It is required by the libcap2
+        attributes on filesystem objects.  It is required by the libcap
         library.</para>
       </listitem>
 
@@ -450,18 +450,16 @@
       </listitem>
 
       <listitem>
-        <para>Sysklogd</para>
+        <para>Systemd</para>
 
-        <para>This package contains programs for logging system messages,
-        such as those given by the kernel or daemon processes when unusual
-        events occur.</para>
+        <para>This package contains programs for controlling the startup,
+        running, and shutdown of the system.</para>
       </listitem>
 
       <listitem>
-        <para>Systemd</para>
+        <para>Sysvinit</para>
 
-        <para>This package contains programs for controlling the startup,
-        running, and shutdown of the system.</para>
+        <para>This package provides misc. utils needed by some packages.</para>
       </listitem>
 
       <listitem>