Index: make-aux-files.sh
===================================================================
--- make-aux-files.sh	(revision 9551)
+++ make-aux-files.sh	(working copy)
@@ -8,7 +8,7 @@
 
 # Create the tarball and clean up
 tar -cjf lfs-bootscripts-$version.tar.bz2 --exclude .svn lfs-bootscripts-$version
-mv lfs-bootscripts-$version lsb-bootscripts 
+mv lfs-bootscripts-$version lsb-bootscripts
 
 rm -f udev-config*.bz2
 
Index: chapter01/changelog.xml
===================================================================
--- chapter01/changelog.xml	(revision 9551)
+++ chapter01/changelog.xml	(working copy)
@@ -36,6 +36,18 @@
     </listitem>
 
 -->
+   <listitem>
+      <para>2011-05-23</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Added initd-tools package.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Switch to LSB bootscripts.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2011-05-22</para>
       <itemizedlist>
Index: chapter03/packages.xml
===================================================================
--- chapter03/packages.xml	(revision 9551)
+++ chapter03/packages.xml	(working copy)
@@ -266,7 +266,17 @@
       </listitem>
     </varlistentry>
 
+
     <varlistentry>
+      <term>Initd-Tools (&initd-tools-version;) - <token>&initd-tools-size;</token>:</term>
+      <listitem>
+        <para>Home page: <ulink url="&initd-tools-home;"/></para>
+        <para>Download: <ulink url="&initd-tools-url;"/></para>
+        <para>MD5 sum: <literal>&initd-tools-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>IPRoute2 (&iproute2-version;) - <token>&iproute2-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&iproute2-home;"/></para>
Index: chapter06/sysvinit.xml
===================================================================
--- chapter06/sysvinit.xml	(revision 9551)
+++ chapter06/sysvinit.xml	(working copy)
@@ -94,7 +94,7 @@
 
 id:3:initdefault:
 
-si::sysinit:/etc/rc.d/init.d/rc sysinit
+si::sysinit:/etc/rc.d/init.d/rc S
 
 l0:0:wait:/etc/rc.d/init.d/rc 0
 l1:S1:wait:/etc/rc.d/init.d/rc 1
Index: chapter06/chapter06.xml
===================================================================
--- chapter06/chapter06.xml	(revision 9551)
+++ chapter06/chapter06.xml	(working copy)
@@ -58,6 +58,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="groff.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="grub.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="initd-tools.xml"/>
   <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="less.xml"/>
Index: chapter06/initd-tools.xml
===================================================================
--- chapter06/initd-tools.xml	(revision 0)
+++ chapter06/initd-tools.xml	(revision 0)
@@ -0,0 +1,101 @@
+<?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-initd-tools" role="wrap">
+  <?dbhtml filename="initd-tools.html"?>
+
+  <sect1info condition="script">
+    <productname>initd-tools</productname>
+    <productnumber>&initd-tools-version;</productnumber>
+    <address>&initd-tools-url;</address>
+  </sect1info>
+
+  <title>Initd-Tools-&initd-tools-version;</title>
+
+  <indexterm zone="ch-system-initd-tools">
+    <primary sortas="a-Initd-Tools">Initd-Tools</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>The Initd-Tools package provides an implementation of the init script
+    installation and removal programs in the Linux Standard Base (LSB) 4.1
+    specification.</para>
+
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
+
+      <seglistitem>
+        <seg>&initd-tools-ch6-sbu;</seg>
+        <seg>&initd-tools-ch6-du;</seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Initd-Tools</title>
+
+    <para>Configure the package with the following command:</para>
+
+<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
+
+    <para>Build the package:</para>
+
+<screen><userinput remap="make">make</userinput></screen>
+
+    <para>Install the package:</para>
+
+<screen><userinput remap="install">make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 id="contents-initd-tools" role="content">
+    <title>Contents of Initd-Tools</title>
+
+    <segmentedlist>
+      <segtitle>Installed files</segtitle>
+
+      <seglistitem>
+        <seg>/usr/lib/lsb/install_initd and /usr/lib/lsb/remove_initd</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="install_initd">
+        <term><filename>/usr/lib/lsb/install_initd</filename></term>
+        <listitem>
+          <para>Creates symlinks in the startup folders for installed
+          init scripts.</para>
+          <indexterm zone="ch-system-initd-tools">
+            <primary sortas="a-/usr/lib/lsb/inistall_initd">/usr/lib/lsb/install_initd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="remove_initd">
+        <term><filename>/usr/lib/lsb/remove_initd</filename></term>
+        <listitem>
+          <para>Removes symlinks in the startup folders for installed
+          init scripts.</para>
+          <indexterm zone="ch-system-initd-tools">
+            <primary sortas="a-/usr/lib/lsb/remove_initd">/usr/lib/lsb/remove_initd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: chapter07/console.xml
===================================================================
--- chapter07/console.xml	(revision 9551)
+++ chapter07/console.xml	(working copy)
@@ -21,16 +21,14 @@
   </indexterm>
 
   <para>This section discusses how to configure the <command>console</command>
-  and <command>consolelog</command> bootscripts that set up the keyboard map,
-  console font and console kernel log level. If non-ASCII characters (e.g.,
-  the copyright sign, the British pound sign and Euro symbol) will not be used
-  and the keyboard is a U.S. one, much of this section can be skipped. Without
-  the configuration file, the <command>console</command> bootscript will do
-  nothing.</para>
+  bootscript that sets up the keyboard map and console font. If non-ASCII
+  characters (e.g., the copyright sign, the British pound sign and Euro symbol)
+  will not be used and the keyboard is a U.S. one, much of this section can be
+  skipped. Without the configuration file, the <command>console</command>
+  bootscript will do nothing.</para>
 
-  <para>The <command>console</command>  and <command>consolelog</command>
-  scripts read the <filename>/etc/sysconfig/console</filename> file for
-  configuration information.
+  <para>The <command>console</command> script reads the
+  <filename>/etc/default/console</filename> file for configuration information.
   Decide which keymap and screen font will be used. Various language-specific
   HOWTOs can also help with this, see <ulink
   url="http://www.tldp.org/HOWTO/HOWTO-INDEX/other-lang.html"/>. If still in
@@ -39,21 +37,12 @@
   <filename>loadkeys(1)</filename> and <filename>setfont(8)</filename> manual
   pages to determine the correct arguments for these programs.</para>
 
-  <para>The <filename>/etc/sysconfig/console</filename> file should contain lines
+  <para>The <filename>/etc/default/console</filename> file should contain lines
   of the form: VARIABLE="value". The following variables are recognized:</para>
 
   <variablelist>
 
     <varlistentry>
-      <term>LOGLEVEL</term>
-      <listitem>
-        <para>This variable specifies the log level for kernel messages sent
-        to the console as set by <command>dmesg</command>. Valid levels are
-        from "1" (no messages) to "8". The default level is "7".</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term>KEYMAP</term>
       <listitem>
         <para>This variable specifies the arguments for the
@@ -70,9 +59,9 @@
         <para>This (rarely used) variable
         specifies the arguments for the second call to the
         <command>loadkeys</command> program. This is useful if the stock keymap
-        is not completely satisfactory and a small adjustment has to be made. E.g.,
-        to include the Euro sign into a keymap that normally doesn't have it,
-        set this variable to <quote>euro2</quote>.</para>
+        is not completely satisfactory and a small adjustment has to be made.
+        E.g., to include the Euro sign into a keymap that normally doesn't have
+        it, set this variable to <quote>euro2</quote>.</para>
       </listitem>
     </varlistentry>
 
@@ -125,13 +114,13 @@
       <para>For a non-Unicode setup, only the KEYMAP and FONT variables are
       generally needed. E.g., for a Polish setup, one would use:</para>
 
-<screen role="nodump"><userinput>cat &gt; /etc/sysconfig/console &lt;&lt; "EOF"
-<literal># Begin /etc/sysconfig/console
+<screen role="nodump"><userinput>cat &gt; /etc/default/console &lt;&lt; "EOF"
+<literal># Begin /etc/default/console
 
 KEYMAP="pl2"
 FONT="lat2a-16 -m 8859-2"
 
-# End /etc/sysconfig/console</literal>
+# End /etc/default/console</literal>
 EOF</userinput></screen>
     </listitem>
 
@@ -140,14 +129,14 @@
       stock keymap slightly. The following example adds the Euro symbol to the
       German keymap:</para>
 
-<screen role="nodump"><userinput>cat &gt; /etc/sysconfig/console &lt;&lt; "EOF"
-<literal># Begin /etc/sysconfig/console
+<screen role="nodump"><userinput>cat &gt; /etc/default/console &lt;&lt; "EOF"
+<literal># Begin /etc/default/console
 
 KEYMAP="de-latin1"
 KEYMAP_CORRECTIONS="euro2"
 FONT="lat0-16 -m 8859-15"
 
-# End /etc/sysconfig/console</literal>
+# End /etc/default/console</literal>
 EOF</userinput></screen>
     </listitem>
 
@@ -155,14 +144,14 @@
       <para>The following is a Unicode-enabled example for Bulgarian, where a
       stock UTF-8 keymap exists:</para>
 
-<screen role="nodump"><userinput>cat &gt; /etc/sysconfig/console &lt;&lt; "EOF"
-<literal># Begin /etc/sysconfig/console
+<screen role="nodump"><userinput>cat &gt; /etc/default/console &lt;&lt; "EOF"
+<literal># Begin /etc/default/console
 
 UNICODE="1"
 KEYMAP="bg_bds-utf8"
 FONT="LatArCyrHeb-16"
 
-# End /etc/sysconfig/console</literal>
+# End /etc/default/console</literal>
 EOF</userinput></screen>
     </listitem>
 
@@ -174,14 +163,14 @@
       it is still possible to use a language-specific 256-glyph font, as
       illustrated below:</para>
 
-<screen role="nodump"><userinput>cat &gt; /etc/sysconfig/console &lt;&lt; "EOF"
-<literal># Begin /etc/sysconfig/console
+<screen role="nodump"><userinput>cat &gt; /etc/default/console &lt;&lt; "EOF"
+<literal># Begin /etc/default/console
 
 UNICODE="1"
 KEYMAP="bg_bds-utf8"
 FONT="cyr-sun16"
 
-# End /etc/sysconfig/console</literal>
+# End /etc/default/console</literal>
 EOF</userinput></screen>
     </listitem>
 
@@ -189,8 +178,8 @@
       <para>The following example illustrates keymap autoconversion from
       ISO-8859-15 to UTF-8 and enabling dead keys in Unicode mode:</para>
 
-<screen role="nodump"><userinput>cat &gt; /etc/sysconfig/console &lt;&lt; "EOF"
-<literal># Begin /etc/sysconfig/console
+<screen role="nodump"><userinput>cat &gt; /etc/default/console &lt;&lt; "EOF"
+<literal># Begin /etc/default/console
 
 UNICODE="1"
 KEYMAP="de-latin1"
@@ -198,7 +187,7 @@
 LEGACY_CHARSET="iso-8859-15"
 FONT="LatArCyrHeb-16 -m 8859-15"
 
-# End /etc/sysconfig/console</literal>
+# End /etc/default/console</literal>
 EOF</userinput></screen>
     </listitem>
 
@@ -232,7 +221,8 @@
   <!-- Added because folks keep posting their console file with X questions
   to blfs-support list -->
   <note>
-    <para>The <filename>/etc/sysconfig/console</filename> file only controls the    Linux text console localization. It has nothing to do with setting the
+    <para>The <filename>/etc/default/console</filename> file only controls the
+    Linux text console localization. It has nothing to do with setting the
     proper keyboard layout and terminal fonts in the X Window System, with ssh
     sessions or with a serial console. In such situations, limitations mentioned
     in the last two list items above do not apply.</para>
Index: chapter07/setclock.xml
===================================================================
--- chapter07/setclock.xml	(revision 9551)
+++ chapter07/setclock.xml	(working copy)
@@ -16,11 +16,11 @@
 
   <para>The <command>setclock</command> script reads the time from the hardware
   clock, also known as the BIOS or the Complementary Metal Oxide Semiconductor
-  (CMOS) clock. If the hardware clock is set to UTC, this script will convert the
-  hardware clock's time to the local time using the
+  (CMOS) clock. If the hardware clock is set to UTC, this script will convert
+  the hardware clock's time to the local time using the
   <filename>/etc/localtime</filename> file (which tells the
-  <command>hwclock</command> program which timezone the user is in). There is no
-  way to detect whether or not the hardware clock is set to UTC, so this
+  <command>hwclock</command> program which timezone the user is in). There is
+  no way to detect whether or not the hardware clock is set to UTC, so this
   needs to be configured manually.</para>
 
   <para>The <command>setclock</command> is run via
@@ -31,33 +31,19 @@
   <para>If you cannot remember whether or not the hardware clock is set to UTC,
   find out by running the <userinput>hwclock --localtime --show</userinput>
   command. This will display what the current time is according to the hardware
-  clock. If this time matches whatever your watch says, then the hardware clock is
-  set to local time. If the output from <command>hwclock</command> is not local
-  time, chances are it is set to UTC time. Verify this by adding or subtracting
-  the proper amount of hours for the timezone to the time shown by
+  clock. If this time matches whatever your watch says, then the hardware clock
+  is set to local time. If the output from <command>hwclock</command> is not
+  local time, chances are it is set to UTC time. Verify this by adding or
+  subtracting the proper amount of hours for the timezone to the time shown by
   <command>hwclock</command>. For example, if you are currently in the MST
   timezone, which is also known as GMT -0700, add seven hours to the local
   time.</para>
 
-  <para>Change the value of the <envar>UTC</envar> variable below
-  to a value of <parameter>0</parameter> (zero) if the hardware clock
+  <para>Change the value of the <envar>UTC</envar> variable in the
+  <filename>/etc/default/rc.site</filename> file to a value of
+  <parameter>0</parameter> (zero) if the hardware clock
   is <emphasis>not</emphasis> set to UTC time.</para>
 
-  <para>Create a new file <filename>/etc/sysconfig/clock</filename> by running
-  the following:</para>
-
-<screen><userinput>cat &gt; /etc/sysconfig/clock &lt;&lt; "EOF"
-<literal># Begin /etc/sysconfig/clock
-
-UTC=1
-
-# Set this to any options you might need to give to hwclock, 
-# such as machine hardware clock type for Alphas.
-CLOCKPARAMS=
-
-# End /etc/sysconfig/clock</literal>
-EOF</userinput></screen>
-
   <para>A good hint explaining how to deal with time on LFS is available
   at <ulink url="&hints-root;time.txt"/>. It explains issues such as
   time zones, UTC, and the <envar>TZ</envar> environment variable.</para>
Index: chapter07/network.xml
===================================================================
--- chapter07/network.xml	(revision 9551)
+++ chapter07/network.xml	(working copy)
@@ -113,17 +113,17 @@
 
     <para>Which interfaces are brought up and down by the network script
     depends on the files and directories in the <filename
-    class="directory">/etc/sysconfig/network-devices</filename> hierarchy.
-    This directory should contain a sub-directory for each interface to be
-    configured, such as <filename>ifconfig.xyz</filename>, where
-    <quote>xyz</quote> is a network interface name. Inside this directory
-    would be files defining the attributes to this interface, such as its IP
-    address(es), subnet masks, and so forth.</para>
+    class="directory">/etc/network</filename> hierarchy. This directory should
+    contain a sub-directory for each interface to be configured, such as
+    <filename>ifconfig.xyz</filename>, where <quote>xyz</quote> is a network
+    interface name. Inside this directory would be files defining the
+    attributes to this interface, such as its IP address(es), subnet masks, and
+    so forth.</para>
 
     <para>The following command creates a sample <filename>ipv4</filename>
     file for the <emphasis>eth0</emphasis> device:</para>
 
-<screen><userinput>cd /etc/sysconfig/network-devices
+<screen><userinput>cd /etc/network
 mkdir -v ifconfig.eth0
 cat &gt; ifconfig.eth0/ipv4 &lt;&lt; "EOF"
 <literal>ONBOOT=yes
@@ -143,9 +143,9 @@
 
     <para>The <envar>SERVICE</envar> variable defines the method used for
     obtaining the IP address. The LFS-Bootscripts package has a modular IP
-    assignment format, and creating additional files in the <filename
-    class="directory">/etc/sysconfig/network-devices/services</filename>
-    directory allows other IP assignment methods. This is commonly used for
+    assignment format, and creating additional files in the
+    <filename class="directory">/lib/network-services</filename> directory
+    allows other IP assignment methods. This is commonly used for
     Dynamic Host Configuration Protocol (DHCP), which is addressed in the
     BLFS book.</para>
 
Index: chapter07/bootscripts.xml
===================================================================
--- chapter07/bootscripts.xml	(revision 9551)
+++ chapter07/bootscripts.xml	(working copy)
@@ -23,8 +23,8 @@
   <sect2 role="package">
     <title/>
 
-    <para>The LFS-Bootscripts package contains a set of scripts to start/stop the
-    LFS system at bootup/shutdown.</para>
+    <para>The LFS-Bootscripts package contains a set of scripts to start/stop
+    the LFS system at bootup/shutdown.</para>
 
     <segmentedlist>
       <segtitle>&buildtime;</segtitle>
@@ -55,11 +55,12 @@
       <segtitle>Installed directories</segtitle>
 
       <seglistitem>
-        <seg>checkfs, cleanfs, console, consolelog, functions, halt, ifdown,
-        ifup, localnet, modules, mountfs, mountkernfs, network, rc, reboot,
-        sendsignals, setclock, static, swap, sysctl, sysklogd, template,
-        udev, and udev_retry</seg>
-        <seg>/etc/rc.d, /etc/sysconfig</seg>
+        <seg>checkfs, cleanfs, console, halt, ifdown, ifup, init-functions,
+        localnet, modules, mountfs, mountkernfs, network, rc,
+        reboot, sendsignals, setclock, static, swap, sysctl, sysklogd,
+        template, udev, and udev_retry</seg>
+        <seg>/etc/default, /etc/rc.d/init.d, /etc/network, /etc/rc.d/rc?.d,
+        /lib/lsb, /lib/network-services</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -105,28 +106,6 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry id="consolelog-bootscripts">
-        <term><command>consolelog</command></term>
-        <listitem>
-          <para>Sets the kernel log level to control messages reaching the
-          console.</para>
-          <indexterm zone="ch-scripts-bootscripts consolelog-bootscripts">
-            <primary sortas="d-consolelog">consolelog</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="functions-bootscripts">
-        <term><command>functions</command></term>
-        <listitem>
-          <para>Contains common functions, such as error and status checking,
-          that are used by several bootscripts</para>
-          <indexterm zone="ch-scripts-bootscripts functions-bootscripts">
-            <primary sortas="d-functions">functions</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="halt-bootscripts">
         <term><command>halt</command></term>
         <listitem>
@@ -157,6 +136,17 @@
         </listitem>
       </varlistentry>
 
+      <varlistentry id="init-functions-bootscripts">
+        <term><command>init-functions</command></term>
+        <listitem>
+          <para>Contains the LSB defined functions for startup and shutdown
+          scripts.</para>
+          <indexterm zone="ch-scripts-bootscripts init-functions-bootscripts">
+            <primary sortas="d-init-functions">init-functions</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="localnet-bootscripts">
         <term><command>localnet</command></term>
         <listitem>
@@ -171,7 +161,7 @@
         <term><command>modules</command></term>
         <listitem>
           <para>Loads kernel modules listed in
-          <filename>/etc/sysconfig/modules</filename>, using arguments
+          <filename>/etc/default/modules</filename>, using arguments
           that are also given there</para>
           <indexterm zone="ch-scripts-bootscripts modules-bootscripts">
             <primary sortas="d-modules">modules</primary>
Index: chapter07/hostname.xml
===================================================================
--- chapter07/hostname.xml	(revision 9551)
+++ chapter07/hostname.xml	(working copy)
@@ -17,16 +17,13 @@
 
   <para>Part of the job of the <command>localnet</command> script is setting the
   system's hostname. This needs to be configured in the
-  <filename>/etc/sysconfig/network</filename> file.</para>
+  <filename>/etc/default/rc.site</filename> file by the
+  <parameter>HOSTNAME</parameter> variable.</para>
 
-  <para>Create the <filename>/etc/sysconfig/network</filename> file and enter a
-  hostname by running:</para>
+  <para>Edit the <filename>/etc/default/rc.site</filename> and replace the
+  value <replaceable>&lt;lfs&gt;</replaceable> with the name given to the
+  computer. Do not enter the Fully Qualified Domain Name (FQDN) here. That
+  information will be put in the <filename>/etc/hosts</filename> file in the
+  next section.</para>
 
-<screen><userinput>echo "HOSTNAME=<replaceable>&lt;lfs&gt;</replaceable>" &gt; /etc/sysconfig/network</userinput></screen>
-
-  <para><replaceable>&lt;lfs&gt;</replaceable> needs to be replaced with the name given
-  to the computer. Do not enter the Fully Qualified Domain Name (FQDN) here. That
-  information will be put in the <filename>/etc/hosts</filename> file in the next
-  section.</para>
-
 </sect1>
Index: general.ent
===================================================================
--- general.ent	(revision 9551)
+++ general.ent	(working copy)
@@ -1,4 +1,4 @@
-<!ENTITY version "SVN-20110522">
+<!ENTITY version "SVN-20110523">
 <!ENTITY releasedate "May 22, 2011">
 <!ENTITY copyrightdate "1999-2011"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "6.9">
Index: packages.ent
===================================================================
--- packages.ent	(revision 9551)
+++ packages.ent	(working copy)
@@ -273,6 +273,14 @@
 <!ENTITY inetutils-ch6-du "17 MB">
 <!ENTITY inetutils-ch6-sbu "0.4 SBU">
 
+<!ENTITY initd-tools-version "0.1.3">
+<!ENTITY initd-tools-size "296 KB">
+<!ENTITY initd-tools-url "http://people.freedesktop.org/~dbn/initd-tools/releases/initd-tools-&initd-tools-version;.tar.gz">
+<!ENTITY initd-tools-md5 "ab6377700ace81ec5a556ebdbae1d8d9">
+<!ENTITY initd-tools-home "http://people.freedesktop.org/~dbn/initd-tools/">
+<!ENTITY initd-tools-ch6-du "192 KB">
+<!ENTITY initd-tools-ch6-sbu "less than 0.1 SBU">
+
 <!ENTITY iproute2-version "2.6.38">
 <!ENTITY iproute2-size "381 KB">
 <!ENTITY iproute2-url "http://devresources.linuxfoundation.org/dev/iproute2/download/iproute2-&iproute2-version;.tar.bz2">
@@ -297,7 +305,7 @@
 <!ENTITY less-ch6-du "2.9 MB">
 <!ENTITY less-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY lfs-bootscripts-version "20110424">                 <!-- Scripts depend on this format -->
+<!ENTITY lfs-bootscripts-version "20110523">                 <!-- Scripts depend on this format -->
 <!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB">         <!-- Updated in Makefile -->
 <!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2">
 <!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM">           <!-- Updated in Makefile -->
@@ -551,7 +559,7 @@
 <!ENTITY udev-testfiles-md5 "d0af45f57f7cfcd509fc07de2c6508ed">
 <!ENTITY udev-testfiles-du "37 MB">
 
-<!ENTITY udev-config "udev-config-20100128"> <!-- Scripts depend on this format -->
+<!ENTITY udev-config "udev-config-20110523"> <!-- Scripts depend on this format -->
 <!ENTITY udev-config-size "UDEV-SIZE KB">    <!-- Updated in Makefile -->
 <!ENTITY udev-config-url "&downloads-root;&udev-config;.tar.bz2">
 <!ENTITY udev-config-md5 "UDEV-MD5SUM">      <!-- Updated in Makefile -->
Index: udev-config/55-lfs.rules
===================================================================
--- udev-config/55-lfs.rules	(revision 9551)
+++ udev-config/55-lfs.rules	(working copy)
@@ -3,8 +3,8 @@
 # Core kernel devices
 
 # This causes the system clock to be set as soon as /dev/rtc becomes available.
-SUBSYSTEM=="rtc", ACTION=="add", MODE="0644", RUN+="/etc/rc.d/init.d/setclock start"
-KERNEL=="rtc", ACTION=="add", MODE="0644", RUN+="/etc/rc.d/init.d/setclock start"
+SUBSYSTEM=="rtc", ACTION=="add", MODE="0644", RUN+="/etc/init.d/setclock start"
+KERNEL=="rtc", ACTION=="add", MODE="0644", RUN+="/etc/init.d/setclock start"
 
 # Comms devices
 
Index: udev-config/ChangeLog
===================================================================
--- udev-config/ChangeLog	(revision 9551)
+++ udev-config/ChangeLog	(working copy)
@@ -1,3 +1,6 @@
+2011-05-23	DJ Lucas <dj@linuxfromscratch.org>
+	* 55-lfs.rules: Change path of setclock script for lsb-bootscripts.
+
 2010-01-26	Matt Burgess <matthew@linuxfromscratch.org>
 	* 55-lfs.rules: Remove lots of rules that have been merged upstream.
 	* 61-cdrom.rules: Remove as upstream has a replacement.
Index: appendices/scripts.xml
===================================================================
--- appendices/scripts.xml	(revision 9551)
+++ appendices/scripts.xml	(working copy)
@@ -2,6 +2,7 @@
 <!DOCTYPE appendix 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">
+  <!ENTITY init_functions     SYSTEM "init-functions.script"> 
   <!ENTITY checkfs            SYSTEM "checkfs.script"> 
   <!ENTITY cleanfs            SYSTEM "cleanfs.script"> 
   <!ENTITY console            SYSTEM "console.script"> 
@@ -24,7 +25,7 @@
   <!ENTITY createfiles        SYSTEM "createfiles.script"> 
   <!ENTITY modules_sys        SYSTEM "modules-sysinit.script"> 
   <!ENTITY rc_sys             SYSTEM "rc-sysinit.script"> 
-  <!ENTITY rc_site            SYSTEM "rc-site.script"> 
+  <!ENTITY rc_site            SYSTEM "rc.site.script"> 
   <!ENTITY ifup               SYSTEM "ifup.script"> 
   <!ENTITY ifdown             SYSTEM "ifdown.script"> 
   <!ENTITY ipv4_static        SYSTEM "ipv4-static.script"> 
@@ -36,14 +37,16 @@
   <?dbhtml dir="scripts"?>
   <?dbhtml filename="scripts.html"?>
 
-  <title>Boot and sysconfig scripts version-&lfs-bootscripts-version;</title>
+  <title>Boot and system configuration scripts version-&lfs-bootscripts-version;</title>
 
   <para>The scripts in this appendix are listed by the directory where they
   normally reside.  The order is <filename
+  class='directory'>/lib/lsb</filename>, <filename
   class='directory'>/etc/rc.d/init.d</filename>, <filename
-  class='directory'>/etc/sysconfig</filename>, <filename
-  class='directory'>/etc/sysconfig/network-devices</filename>, and <filename
-  class='directory'>/etc/sysconfig/network-devices/services</filename>.  Within
+  class='directory'>/etc/default</filename>, <filename
+  class='directory'>/etc/network</filename>, <filename
+  class='directory'>/sbin</filename>, and <filename
+  class='directory'>/lib/network-services</filename>.  Within
   each section, the files are listed in the order they are normally called.
   </para>
 
@@ -56,7 +59,12 @@
     <screen>&rc;</screen> 
   </sect1>
 
-  <sect1 id="mountvirtfs" role="wrap">
+  <sect1 id="initfunctions" role="wrap">
+    <title>/lib/lsb/init-functions</title>
+    <screen>&init_functions;</screen>
+  </sect1>
+
+  <sect1 id="mountkernfs" role="wrap">
     <title>/etc/rc.d/init.d/mountvirtfs</title>
     <screen>&mountvirtfs;</screen> 
   </sect1>
@@ -147,37 +155,42 @@
   </sect1>
 
   <sect1 id="rcsys" role="wrap">
-    <title>/etc/sysconfig/rc</title>
+    <title>/etc/default/rc</title>
     <screen>&rc_sys;</screen> 
   </sect1>
 
+  <sect1 id="rcsite" role="wrap">
+    <title>/etc/default/rc.site</title>
+    <screen>&rc_site;</screen>
+  </sect1>
+
   <sect1 id="modulessys" role="wrap">
-    <title>/etc/sysconfig/modules</title>
+    <title>/etc/default/modules</title>
     <screen>&modules_sys;</screen> 
   </sect1>
 
   <sect1 id="createfiles" role="wrap">
-    <title>/etc/sysconfig/createfiles</title>
+    <title>/etc/default/createfiles</title>
     <screen>&createfiles;</screen> 
   </sect1>
 
   <sect1 id="ifup" role="wrap">
-    <title>/etc/sysconfig/network-devices/ifup</title>
+    <title>/sbin/ifup</title>
     <screen>&ifup;</screen> 
   </sect1>
 
   <sect1 id="ifdown" role="wrap">
-    <title>/etc/sysconfig/network-devices/ifdown</title>
+    <title>/sbin/ifdown</title>
     <screen>&ifdown;</screen> 
   </sect1>
 
   <sect1 id="ipv4static" role="wrap">
-    <title>/etc/sysconfig/network-devices/services/ipv4-static</title>
+    <title>/lib/network-services/ipv4-static</title>
     <screen>&ipv4_static;</screen> 
   </sect1>
 
   <sect1 id="ipv4route" role="wrap">
-    <title>/etc/sysconfig/network-devices/services/ipv4-static-route</title>
+    <title>/lib/network-services/ipv4-static-route</title>
     <screen>&ipv4_static_route;</screen> 
   </sect1>
 
Index: process-scripts.sh
===================================================================
--- process-scripts.sh	(revision 9551)
+++ process-scripts.sh	(working copy)
@@ -1,16 +1,17 @@
 #!/bin/bash
 
 # Boot scripts
-for s in lsb-bootscripts/etc/init.d/*                    \
-         lsb-bootscripts/etc/default/*                 \
-         lsb-bootscripts/sbin/* \
-         lsb-bootscripts/lib/network-services/*
+for s in lsb-bootscripts/etc/init.d/*           \
+         lsb-bootscripts/etc/default/*          \
+         lsb-bootscripts/lib/network-services/* \
+         lsb-bootscripts/lib/lsb/*              \
+         lsb-bootscripts/sbin/*
 do
   script=$(basename $s)
   
   # Skip directories
-  [ $script == 'sbin' ] && continue
-  [ $script == 'network-services'        ] && continue
+  [ $script == 'sbin'             ] && continue
+  [ $script == 'network-services' ] && continue
 
   # Disambiguate duplicate file names
   [ $s == 'lsb-bootscripts/etc/default/rc'      ] && script='rc-sysinit'; 
@@ -20,6 +21,7 @@
        -e "s/'/\&apos\;/g" -e 's/"/\&quot\;/g' -e 's/\t/    /g'  \
        $s > appendices/${script}.script 
 done
+sed 's@ETCDIR@/etc/rc.d@' -i appendices/rc-sysinit.script
 
 # Udev rules
 for s in udev-config/*.rules
