Changes in / [e57ce38:229ed25]

Location:

BOOK

Files:

• appendices/dependencies/common.xml (modified) (9 diffs)
• boot/alpha-chapter.xml (modified) (1 diff)
• boot/common/bootscripts.xml (deleted)
• boot/common/devices.xml (modified) (1 diff)
• boot/common/pwdgroup.xml (modified) (2 diffs)
• boot/common/sysvinit.xml (modified) (1 diff)
• boot/mips-chapter.xml (modified) (1 diff)
• boot/mips64-64-chapter.xml (modified) (1 diff)
• boot/mips64-chapter.xml (modified) (1 diff)
• boot/multilib/sysvinit.xml (modified) (1 diff)
• boot/ppc-chapter.xml (modified) (1 diff)
• boot/ppc64-64/powerpc-utils.xml (modified) (1 diff)
• boot/ppc64-chapter.xml (modified) (1 diff)
• boot/ppc64/util-linux-32.xml (modified) (1 diff)
• boot/sparc-chapter.xml (modified) (1 diff)
• boot/sparc64-64-chapter.xml (modified) (1 diff)
• boot/sparc64-chapter.xml (modified) (1 diff)
• boot/x86-chapter.xml (modified) (1 diff)
• boot/x86_64-64-chapter.xml (modified) (1 diff)
• boot/x86_64-chapter.xml (modified) (1 diff)
• bootscripts/alpha-chapter.xml (modified) (1 diff)
• bootscripts/common/bootscripts.xml (deleted)
• bootscripts/common/console.xml (modified) (1 diff)
• bootscripts/common/introduction.xml (modified) (1 diff)
• bootscripts/common/locale.xml (modified) (4 diffs)
• bootscripts/common/profile.xml (modified) (1 diff)
• bootscripts/common/setclock.xml (deleted)
• bootscripts/common/usage.xml (modified) (2 diffs)
• bootscripts/mips-chapter.xml (modified) (1 diff)
• bootscripts/mips64-64-chapter.xml (modified) (1 diff)
• bootscripts/mips64-chapter.xml (modified) (1 diff)
• bootscripts/ppc-chapter.xml (modified) (1 diff)
• bootscripts/ppc64-chapter.xml (modified) (1 diff)
• bootscripts/sparc-chapter.xml (modified) (1 diff)
• bootscripts/sparc64-64-chapter.xml (modified) (1 diff)
• bootscripts/sparc64-chapter.xml (modified) (1 diff)
• bootscripts/x86-chapter.xml (modified) (1 diff)
• bootscripts/x86_64-64-chapter.xml (modified) (1 diff)
• bootscripts/x86_64-chapter.xml (modified) (1 diff)
• chroot/common/pwdgroup.xml (modified) (2 diffs)
• final-system/alpha-chapter.xml (modified) (2 diffs)
• final-system/common/attr.xml (added)
• final-system/common/coreutils.xml (modified) (1 diff)
• final-system/common/dbus.xml (added)
• final-system/common/eudev.xml (deleted)
• final-system/common/expat.xml (added)
• final-system/common/kbd.xml (modified) (1 diff)
• final-system/common/libcap.xml (added)
• final-system/common/systemd.xml (added)
• final-system/common/util-linux.xml (modified) (1 diff)
• final-system/mips-chapter.xml (modified) (2 diffs)
• final-system/mips64-64-chapter.xml (modified) (2 diffs)
• final-system/mips64-chapter.xml (modified) (6 diffs)
• final-system/multilib/attr-64bit.xml (added)
• final-system/multilib/attr-n32.xml (added)
• final-system/multilib/attr.xml (added)
• final-system/multilib/dbus-64bit.xml (added)
• final-system/multilib/dbus-n32.xml (added)
• final-system/multilib/dbus.xml (added)
• final-system/multilib/eudev-64bit.xml (deleted)
• final-system/multilib/eudev-n32.xml (deleted)
• final-system/multilib/eudev.xml (deleted)
• final-system/multilib/expat-64bit.xml (added)
• final-system/multilib/expat-n32.xml (added)
• final-system/multilib/expat.xml (added)
• final-system/multilib/libcap-64bit.xml (added)
• final-system/multilib/libcap-n32.xml (added)
• final-system/multilib/libcap.xml (added)
• final-system/multilib/systemd-64bit.xml (added)
• final-system/multilib/systemd-n32.xml (added)
• final-system/multilib/systemd.xml (added)
• final-system/multilib/util-linux-64bit.xml (modified) (1 diff)
• final-system/multilib/util-linux-n32.xml (modified) (1 diff)
• final-system/ppc-chapter.xml (modified) (2 diffs)
• final-system/ppc64-64-chapter.xml (modified) (1 diff)
• final-system/ppc64-chapter.xml (modified) (3 diffs)
• final-system/sparc-chapter.xml (modified) (2 diffs)
• final-system/sparc64-64-chapter.xml (modified) (2 diffs)
• final-system/sparc64-chapter.xml (modified) (3 diffs)
• final-system/x86-chapter.xml (modified) (2 diffs)
• final-system/x86_64-64-chapter.xml (modified) (2 diffs)
• final-system/x86_64-chapter.xml (modified) (3 diffs)
• general.ent (modified) (1 diff)
• introduction/common/changelog.xml (modified) (1 diff)
• materials/common/packages.xml (modified) (5 diffs)
• packages.ent (modified) (5 diffs)
• users_groups.ent (modified) (2 diffs)

BOOK/appendices/dependencies/common.xml

@@ -31 +31 @@
   </para>
 
+<!-- Begin Attr dependency info -->
+  <bridgehead renderas="sect2" id="attr-dep">Attr</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>Autoconf, Automake, Bash, Binutils, Coreutils, EGLIBC, GCC, Grep,
+         Libtool, Make and Sed</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>No testsuite available</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>Libcap</seg>
+        </seglistitem>
+      </segmentedlist>
+
 <!-- Begin Autoconf dependency info -->
   <bridgehead renderas="sect2" id="autoconf-dep">Autoconf</bridgehead>
@@ -337 +365 @@
       </segmentedlist>
 
+<!-- Begin D-Bus dependency info -->
+  <bridgehead renderas="sect2" id="dbus-dep">D-Bus</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>Bash, Binutils, Coreutils, Diffutils, Expat, Gawk, GCC,
+         Gettext, Grep, Make, Man, Pkg-config, Sed and Texinfo</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>systemd</seg>
+        </seglistitem>
+      </segmentedlist>
+
 <!-- Begin DejaGNU dependency info -->
   <bridgehead renderas="sect2" id="dejagnu-dep">DejaGNU</bridgehead>
@@ -444 +500 @@
         <seglistitem>
           <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
+<!-- Begin Expat dependency info -->
+  <bridgehead renderas="sect2" id="expat-dep">Expat</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, GCC, Grep,
+         Make and Sed</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>D-Bus</seg>
         </seglistitem>
       </segmentedlist>
@@ -1005 +1089 @@
       </segmentedlist>
 
+<!-- Begin Libcap dependency info -->
+  <bridgehead renderas="sect2" id="libcap-dep">Libcap</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>Attr, Bash, Binutils, Coreutils, EGLIBC, GCC, Grep and Make</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>No testsuite available</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>systemd</seg>
+        </seglistitem>
+      </segmentedlist>
+
 <!-- Begin libestr dependency info -->
   <bridgehead renderas="sect2" id="libee-dep">Libee</bridgehead>
@@ -1224 +1335 @@
 
         <seglistitem>
-          <seg>None</seg>
+          <seg>D-Bus</seg>
         </seglistitem>
       </segmentedlist>
@@ -1447 +1558 @@
 
         <seglistitem>
-          <seg>Util-linux, E2fsprogs</seg>
+          <seg>E2fsprogs, Pkg-config, systemd, Util-linux</seg>
         </seglistitem>
       </segmentedlist>
@@ -1618 +1729 @@
       </segmentedlist>
 
+<!-- Begin systemd dependency info -->
+  <bridgehead renderas="sect2" id="systemd-dep">systemd</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>Bash, Binutils, Coreutils, D-Bus, EGLIBC, Findutils, Gawk, GCC,
+         Grep, Libcap, Make, Pkg-config, Sed, Udev and Util-linux</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>No testsuite available</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
 <!-- Begin Sysvinit dependency info -->
   <bridgehead renderas="sect2" id="sysvinit-dep">Sysvinit</bridgehead>
@@ -1753 +1892 @@
 
         <seglistitem>
-          <seg>None</seg>
+          <seg>systemd</seg>
         </seglistitem>
       </segmentedlist>
@@ -1781 +1920 @@
 
         <seglistitem>
-          <seg>E2fsprogs</seg>
+          <seg>E2fsprogs, systemd</seg>
         </seglistitem>
       </segmentedlist>

BOOK/boot/alpha-chapter.xml

@@ -26 +26 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>

BOOK/boot/common/devices.xml

@@ -36 +36 @@
     the following commands:</para>
 
-<screen><userinput>mknod -m 600 ${CLFS}/dev/console c 5 1
-mknod -m 666 ${CLFS}/dev/null c 1 3</userinput></screen>
+<screen><userinput>mknod -m 0600 ${CLFS}/dev/console c 5 1
+mknod -m 0666 ${CLFS}/dev/null c 1 3
+mknod -m 0666 ${CLFS}/dev/zero c 1 5</userinput></screen>
 
-    <para>Before udev starts, a tmpfs filesystem is mounted over
+    <para>When systemd starts a tmpfs filesystem is mounted over
     <filename class="directory">/dev</filename> and the previous entries are
-    no longer available. The following command creates files that are copied
-    over by the udev bootscript:</para>
+    no-longer available. The folling command creates files that are copied
+    over when udevd starts:</para>
 
-<screen><userinput>mknod -m 600 ${CLFS}/lib/udev/devices/console c 5 1
-mknod -m 666 ${CLFS}/lib/udev/devices/null c 1 3</userinput></screen>
+<screen><userinput>mkdir -pv ${CLFS}/lib/udev/devices/{pts,shm}
+mknod -m 0600 ${CLFS}/lib/udev/devices/console c 5 1
+mknod -m 0666 ${CLFS}/lib/udev/devices/null c 1 3
+mknod -m 0666 ${CLFS}/lib/udev/devices/zero c 1 5
+mknod -m 0600 ${CLFS}/lib/udev/devices/kmsg c 1 11
+ln -snvf /proc/self/fd ${CLFS}/lib/udev/devices/fd
+ln -snvf /proc/self/fd/0 ${CLFS}/lib/udev/devices/stdin
+ln -snvf /proc/self/fd/1 ${CLFS}/lib/udev/devices/stdout
+ln -snvf /proc/self/fd/2 ${CLFS}/lib/udev/devices/stderr
+ln -snvf /proc/kcore ${CLFS}/lib/udev/devices/core</userinput></screen>
 
   </sect2>

BOOK/boot/common/pwdgroup.xml

@@ -44 +44 @@
 
 <screen><userinput>cat &gt; ${CLFS}/etc/passwd &lt;&lt; "EOF"
-<literal>root::&uid-root;:&gid-root;:root:/root:/bin/bash</literal>
+<literal>root:x:&uid-root;:&gid-root;:root:/root:/bin/bash</literal>
+<literal>messagebus:x:&uid-messagebus;:&gid-messagebus;:D-Bus Message Daemon User:/dev/null:/bin/false</literal>
 EOF</userinput></screen>
 
@@ -131 +132 @@
 utmp:x:&gid-utmp;:
 usb:x:&gid-usb;:
-cdrom:x:&gid-cdrom;:</literal>
+cdrom:x:&gid-cdrom;:
+messagebus:x:&gid-messagebus;:</literal>
 EOF</userinput></screen>
 

BOOK/boot/common/sysvinit.xml

@@ -111 +111 @@
   </sect2>
 
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-sysvinit" role="."/></para>
-
-  </sect2>
-
 </sect1>

BOOK/boot/mips-chapter.xml

@@ -27 +27 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>

BOOK/boot/mips64-64-chapter.xml

@@ -28 +28 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64-64/flags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>

BOOK/boot/mips64-chapter.xml

@@ -28 +28 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/flags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>

BOOK/boot/multilib/sysvinit.xml

@@ -52 +52 @@
   xpointer="xpointer(//*[@role='configuration'])"/>
 
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-sysvinit" role="."/></para>
-
-  </sect2>
-
 </sect1>

BOOK/boot/ppc-chapter.xml

@@ -28 +28 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>

BOOK/boot/ppc64-64/powerpc-utils.xml

@@ -27 +27 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/ppc/powerpc-utils.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
+<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr \
+  --exec-prefix="" --sysconfdir=/etc \
+  --sbindir=/sbin --libexecdir=/lib/udev \
+  --libdir=/usr/lib --with-systemdsystemunitdir=/lib/systemd/system \
+  --disable-extras --disable-introspection</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/boot/ppc64-chapter.xml

@@ -31 +31 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>

BOOK/boot/ppc64/util-linux-32.xml

@@ -27 +27 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="be"><userinput>CC="${CC} ${BUILD32}" PKG_CONFIG= \
-  ./configure \
-    --prefix=/tools --exec-prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET32} \
-    --without-ncurses --disable-makeinstall-chown</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr \
+  --exec-prefix="" --sysconfdir=/etc \
+  --sbindir=/sbin --libexecdir=/lib/udev \
+  --libdir=/usr/lib32 --with-systemdsystemunitdir=/lib/systemd/system \
+  --disable-extras --disable-introspection</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/boot/sparc-chapter.xml

@@ -27 +27 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>

BOOK/boot/sparc64-64-chapter.xml

@@ -28 +28 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64-64/flags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>

BOOK/boot/sparc64-chapter.xml

@@ -28 +28 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/flags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>

BOOK/boot/x86-chapter.xml

@@ -26 +26 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>

BOOK/boot/x86_64-64-chapter.xml

@@ -27 +27 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/flags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>

BOOK/boot/x86_64-chapter.xml

@@ -27 +27 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/flags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>

BOOK/bootscripts/alpha-chapter.xml

@@ -6 +6 @@
 ]>
 
-<chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
+<chapter id="chapter-bootscripts" xreflabel="Setting Up the System">
   <?dbhtml dir="bootscripts"?>
   <?dbhtml filename="chapter.html"?>
 
-  <title>Setting Up System Bootscripts</title>
+  <title>Setting Up the System</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/setclock.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>

BOOK/bootscripts/common/console.xml

@@ -14 +14 @@
   <secondary>configuring</secondary></indexterm>
 
-  <para>This section discusses how to configure the <command>i18n</command>
-  bootscript that sets up the keyboard map and the console font. If non-ASCII
-  characters (e.g., the British pound sign and Euro character) will not be
-  used and the keyboard is a U.S. one, skip this section. Without the
-  configuration file, the <command>console</command> bootscript will do
-  nothing.</para>
+  <para>This section discusses how to configure the
+  <filename>vconsole.conf</filename> file that sets up the keyboard map and the
+  console font. If non-ASCII characters (e.g., the British pound sign and Euro
+  character) will not be used and the keyboard is most likely a U.S. one. The
+  defaults in the file will probably be suitable for you.</para>
 
-  <para>The <command>i18n</command> script reads the
-  <filename>/etc/sysconfig/i18n</filename> file for configuration
-  information. Decide which keymap and screen font will be used. Various
-  language-specific HOWTO's can also help with this (see <ulink
-  url="http://www.tldp.org/HOWTO/HOWTO-INDEX/other-lang.html"/>. A pre-made
-  <filename>/etc/sysconfig/i18n</filename> file with known settings for
-  several countries was installed with the CLFS-Bootscripts package, so the
-  relevant section can be uncommented if the country is supported. If still
-  in doubt, look in the <filename class="directory">/usr/share/consolefonts</filename>
-  for valid screen fonts and <filename class="directory">/usr/share/keymaps</filename>
-  for valid keymaps.</para>
+  <para>The <filename>vconsole.conf</filename> file is read by the init system
+  and applied on startup. Decide which keymap and screen font will be used.
+  Various language-specific HOWTO's can also help with this (see
+  <ulink url="http://www.tldp.org/HOWTO/HOWTO-INDEX/other-lang.html"/>. Look in
+  <filename class="directory">/usr/share/consolefonts</filename> for valid
+  screen fonts and <filename class="directory">/usr/share/keymaps</filename> for
+  valid keymaps.</para>
 
-  <para>The default <filename>/etc/sysconfig/i18n</filename> is set up for UTF-8
-  using the us keymap. You will need to edit the file to your specific needs.
-  The <filename>/etc/sysconfig/i18n</filename> file has additional information
-  in it to help you to assist in configuring.</para>
+  <para>The default <filename>/etc/vconsole.conf</filename> is set up for a us 
+  keymap. You will need to edit the file to your specific needs. The
+  <filename>vconsole.conf</filename> man page has some information about
+  additional configuration options you may need or want.</para>
+
+<screen><userinput>cat &gt; /etc/vconsole.conf &lt;&lt; "EOF"
+# Begin /etc/vconsole.conf
+
+KEYMAP=us
+FONT=drdos8x16
+
+# End /etc/vconsole.conf
+EOF</userinput></screen>
 
 </sect1>

BOOK/bootscripts/common/introduction.xml

@@ -11 +11 @@
   <title>Introduction</title>
 
-  <para>This chapter details how to install and configure the CLFS-Bootscripts
-  package. Most of these scripts will work without modification, but a few
-  require additional configuration files because they deal with
-  hardware-dependent information.</para>
-
-  <para>System-V style init scripts are employed in this book because they
-  are widely used. For additional options, a hint detailing the BSD style
-  init setup is available at <ulink
-  url="&hints-root;BSD-Init"/>.
-  Searching the LFS mailing lists for <quote>depinit</quote> will also offer
-  additional choices.</para>
-
-  <para>If using an alternative style of init scripts, skip this chapter and
-  move on to <xref linkend="chapter-bootable"/>.</para>
+  <para>This chapter details how to finish configuring the base system.
+  Including some final configuration for systemd and as well as locales and a
+  simple bash profile that should be suitable for most users.</para>
 
 </sect1>

BOOK/bootscripts/common/locale.xml

@@ -11 +11 @@
 
   <indexterm zone="ch-scripts-locale">
-    <primary sortas="e-/etc/profile">/etc/profile</primary>
+    <primary sortas="e-/etc/locale.conf">/etc/locale.conf</primary>
   </indexterm>
 
-  <para>The base <filename>/etc/profile</filename> below sets some
-  environment variables necessary for native language support. Setting
-  them properly results in:</para>
+  <para>The file <filename>/etc/locale.conf</filename> file configures
+  system-wide locale settings. The basic file format of locale.conf is a
+  newline-separated list of variable assignments. It is possible to source this
+  configuration file from shell scripts, but it should never contain any shell
+  script features beyond variable assignments. The
+  <filename>locale.conf</filename> man page contains information about the
+  function of this file. Setting up this file properly results in:</para>
 
   <itemizedlist>
@@ -39 +43 @@
   </itemizedlist>
 
-  <para>This script also sets the <envar>INPUTRC</envar> environment variable
-  that makes Bash and Readline use the <filename>/etc/inputrc</filename> file
-  created earlier.</para>
-
   <para>Replace <replaceable>[ll]</replaceable> below with the
   two-letter code for the desired language (e.g., <quote>en</quote>) and
   <replaceable>[CC]</replaceable> with the two-letter code for the
-  appropriate country (e.g., <quote>GB</quote>).
+  appropriate country (e.g., <quote>GB</quote> or <quote>US</quote>).
   <replaceable>[charmap]</replaceable> should be replaced with the
   canonical charmap for your chosen locale.</para>
@@ -72 +72 @@
   <para>This results in a final locale setting of <quote>en_US.UTF-8</quote>.
   It is important that the locale found using the heuristic above is tested prior
-  to it being added to the Bash startup files:</para>
+  to it being added to <filename>/etc/locale.conf</filename>:</para>
 
 <screen role="nodump"><userinput>LC_ALL=[locale name] locale territory 
@@ -113 +113 @@
 
   <para>Once the proper locale settings have been determined, create the
-  <filename>/etc/profile</filename> file:</para>
+  <filename>/etc/locale.conf</filename> file:</para>
 
-<screen><userinput>cat &gt; /etc/profile &lt;&lt; "EOF"
-<literal># Begin /etc/profile
+<screen><userinput>cat &gt; /etc/locale.conf &lt;&lt; "EOF"
+<literal># Begin /etc/locale.conf
 
-export LANG=<replaceable>[ll]</replaceable>_<replaceable>[CC]</replaceable>.<replaceable>[charmap]</replaceable>
-export INPUTRC=/etc/inputrc
+LANG=<replaceable>[ll]</replaceable>_<replaceable>[CC]</replaceable>.<replaceable>[charmap]</replaceable>
 
-# End /etc/profile</literal>
+# End /etc/locale.conf</literal>
 EOF</userinput></screen>
 

BOOK/bootscripts/common/profile.xml

@@ -38 +38 @@
   <para>The files <filename>/etc/profile</filename> and
   <filename>~/.bash_profile</filename> are read when the shell is
-  invoked as an interactive login shell. In the next section, a base
-  <filename>/etc/profile</filename> will be created to set up locale
-  information.</para>
+  invoked as an interactive login shell. Create a base
+  <filename>/etc/profile</filename> that will setup locale information and load
+  any bash auto completion files that may be on the system. This script also
+  sets the <envar>INPUTRC</envar> environment variable that makes Bash and
+  Readline use <filename>/etc/inputrc</filename>.</para>
+
+<screen><userinput>cat &gt; /etc/profile &lt;&lt; "EOF"
+<literal># Begin /etc/profile
+
+source /etc/locale.conf
+for f in /etc/bash_completion.d/*.sh; do source $f; done; unset f
+export INPUTRC=/etc/inputrc
+
+# End /etc/profile</literal>
+EOF</userinput></screen>
 
 </sect1>

BOOK/bootscripts/common/usage.xml

@@ -9 +9 @@
   <?dbhtml filename="usage.html"?>
 
-  <title>How Do These Bootscripts Work?</title>
+  <title>How does systemd work?</title>
 
   <indexterm zone="ch-scripts-usage">
-    <primary sortas="a-Bootscripts">Bootscripts</primary>
+    <primary sortas="a-systemd-usage">systemd usage</primary>
   <secondary>usage</secondary></indexterm>
 
+  <warning>
+    <para>Please disregard this page until it can be written.</para>
+  </warning>
+<!--
   <para>Linux uses a special booting facility named SysVinit that is
   based on a concept of <emphasis>run-levels</emphasis>. It can be quite
@@ -126 +130 @@
   it is your own CLFS system). The files given here are an example of how
   it can be done.</para>
+-->
 
 </sect1>

BOOK/bootscripts/mips-chapter.xml

@@ -6 +6 @@
 ]>
 
-<chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
+<chapter id="chapter-bootscripts" xreflabel="Setting Up the System">
   <?dbhtml dir="bootscripts"?>
   <?dbhtml filename="chapter.html"?>
 
-  <title>Setting Up System Bootscripts</title>
+  <title>Setting Up the System</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/setclock.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>

BOOK/bootscripts/mips64-64-chapter.xml

@@ -6 +6 @@
 ]>
 
-<chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
+<chapter id="chapter-bootscripts" xreflabel="Setting Up the System">
   <?dbhtml dir="bootscripts"?>
   <?dbhtml filename="chapter.html"?>
 
-  <title>Setting Up System Bootscripts</title>
+  <title>Setting Up the System</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/setclock.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>

BOOK/bootscripts/mips64-chapter.xml

@@ -6 +6 @@
 ]>
 
-<chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
+<chapter id="chapter-bootscripts" xreflabel="Setting Up the System">
   <?dbhtml dir="bootscripts"?>
   <?dbhtml filename="chapter.html"?>
 
-  <title>Setting Up System Bootscripts</title>
+  <title>Setting Up the System</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/setclock.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>

BOOK/bootscripts/ppc-chapter.xml

@@ -6 +6 @@
 ]>
 
-<chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
+<chapter id="chapter-bootscripts" xreflabel="Setting Up the System">
   <?dbhtml dir="bootscripts"?>
   <?dbhtml filename="chapter.html"?>
 
-  <title>Setting Up System Bootscripts</title>
+  <title>Setting Up the System</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/setclock.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>

BOOK/bootscripts/ppc64-chapter.xml

@@ -6 +6 @@
 ]>
 
-<chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
+<chapter id="chapter-bootscripts" xreflabel="Setting Up the System">
   <?dbhtml dir="bootscripts"?>
   <?dbhtml filename="chapter.html"?>
 
-  <title>Setting Up System Bootscripts</title>
+  <title>Setting Up the System</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/setclock.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>

BOOK/bootscripts/sparc-chapter.xml

@@ -6 +6 @@
 ]>
 
-<chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
+<chapter id="chapter-bootscripts" xreflabel="Setting Up the System">
   <?dbhtml dir="bootscripts"?>
   <?dbhtml filename="chapter.html"?>
 
-  <title>Setting Up System Bootscripts</title>
+  <title>Setting Up the System</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/setclock.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>

BOOK/bootscripts/sparc64-64-chapter.xml

@@ -6 +6 @@
 ]>
 
-<chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
+<chapter id="chapter-bootscripts" xreflabel="Setting Up the System">
   <?dbhtml dir="bootscripts"?>
   <?dbhtml filename="chapter.html"?>
 
-  <title>Setting Up System Bootscripts</title>
+  <title>Setting Up the System</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/setclock.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>

BOOK/bootscripts/sparc64-chapter.xml

@@ -6 +6 @@
 ]>
 
-<chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
+<chapter id="chapter-bootscripts" xreflabel="Setting Up the System">
   <?dbhtml dir="bootscripts"?>
   <?dbhtml filename="chapter.html"?>
 
-  <title>Setting Up System Bootscripts</title>
+  <title>Setting Up the System</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/setclock.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>

BOOK/bootscripts/x86-chapter.xml

@@ -6 +6 @@
 ]>
 
-<chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
+<chapter id="chapter-bootscripts" xreflabel="Setting Up the System">
   <?dbhtml dir="bootscripts"?>
   <?dbhtml filename="chapter.html"?>
 
-  <title>Setting Up System Bootscripts</title>
+  <title>Setting Up the System</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/setclock.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>

BOOK/bootscripts/x86_64-64-chapter.xml

@@ -6 +6 @@
 ]>
 
-<chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
+<chapter id="chapter-bootscripts" xreflabel="Setting Up the System">
   <?dbhtml dir="bootscripts"?>
   <?dbhtml filename="chapter.html"?>
 
-  <title>Setting Up System Bootscripts</title>
+  <title>Setting Up the System</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/setclock.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>

BOOK/bootscripts/x86_64-chapter.xml

@@ -6 +6 @@
 ]>
 
-<chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
+<chapter id="chapter-bootscripts" xreflabel="Setting Up the System">
   <?dbhtml dir="bootscripts"?>
   <?dbhtml filename="chapter.html"?>
 
-  <title>Setting Up System Bootscripts</title>
+  <title>Setting Up the System</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/setclock.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>

BOOK/chroot/common/pwdgroup.xml

@@ -44 +44 @@
 <screen><userinput>cat &gt; /etc/passwd &lt;&lt; "EOF"
 <literal>root:x:&uid-root;:&gid-root;:root:/root:/bin/bash</literal>
+<literal>messagebus:x:&uid-messagebus;:&gid-messagebus;:D-Bus Message Daemon User:/dev/null:/bin/false</literal>
 EOF</userinput></screen>
 
@@ -73 +74 @@
 utmp:x:&gid-utmp;:
 usb:x:&gid-usb;:
-cdrom:x:&gid-cdrom;:</literal>
+cdrom:x:&gid-cdrom;:
+messagebus:x:&gid-messagebus;:</literal>
 EOF</userinput></screen>
 

BOOK/final-system/alpha-chapter.xml

@@ -44 +44 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/readline.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/attr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/automake.xml"/>
@@ -60 +61 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iputils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kbd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/less.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dbus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alpha/aboot.xml"/>

BOOK/final-system/common/coreutils.xml

@@ -96 +96 @@
 mv -v /usr/bin/{mv,pwd,rm,rmdir,stty,true,uname} /bin
 mv -v /usr/bin/chroot /usr/sbin</userinput></screen>
-
-    <para os="t">Other Coreutils programs are used by some of the scripts
-    in the CLFS-Bootscripts package. As <filename
-    class="directory">/usr</filename> may not be available during the early
-    stages of booting, those binaries need to be on the root partition:</para>
-
-<screen os="u"><userinput>mv -v /usr/bin/{[,basename,head,install,nice} /bin
-mv -v /usr/bin/{readlink,sleep,sync,test,touch} /bin
-ln -svf ../../bin/install /usr/bin</userinput></screen>
 
   </sect2>

BOOK/final-system/common/kbd.xml

@@ -41 +41 @@
 <screen os="g"><userinput>make install</userinput></screen>
 
-    <para os="h">Some of the programs from Kbd are used by scripts
-    in the CLFS-Bootscripts package. As <filename
-    class="directory">/usr</filename> may not be available during the early
-    stages of booting, those binaries need to be on the root partition:</para>
-
-<screen os="i"><userinput>mv -v /usr/bin/{kbd_mode,dumpkeys,loadkeys,openvt,setfont,setvtrgb} /bin</userinput></screen>
+    <para os="h">Some of the programs from Kbd are used by systemd to
+    initialize the system, those binaries need to be on the root
+    partition:</para>
+
+<screen os="i"><userinput>mv -v /usr/bin/{loadkeys,setfont} /bin</userinput></screen>
 
   </sect2>

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

@@ -77 +77 @@
 
 <screen os="h"><userinput>make install</userinput></screen>
-
-    <para os="i">Move the <command>logger</command> binary to
-    <filename class="directory">/bin</filename> as it is needed by the
-    CLFS-Bootscripts package:</para>
-
-<screen os="j"><userinput>mv -v /usr/bin/logger /bin</userinput></screen>
 
   </sect2>

BOOK/final-system/mips-chapter.xml

@@ -44 +44 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/readline.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/attr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/automake.xml"/>
@@ -60 +61 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iputils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kbd.xml"/>
+<<<<<<< HEAD
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/less.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dbus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/colo.xml"/>

BOOK/final-system/mips64-64-chapter.xml

@@ -44 +44 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/readline.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/attr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/automake.xml"/>
@@ -60 +61 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iputils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kbd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/less.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dbus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/colo.xml"/>

BOOK/final-system/mips64-chapter.xml

@@ -39 +39 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/zlib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/zlib-n32.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/zlib-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/gcc.xml"/>
@@ -76 +77 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/readline-n32.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/readline-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/zlib-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/attr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/attr-n32.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/attr-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/automake.xml"/>
@@ -99 +102 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/iputils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kbd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/less.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap-n32.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap-64bit.xml"/>
+=======
+>>>>>>> master
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz.xml"/>
@@ -104 +113 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/man.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expat-n32.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expat-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dbus.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dbus-n32.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dbus-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod-n32.xml"/>
@@ -109 +124 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/psmisc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/shadow.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd-n32.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr-n32.xml"/>
@@ -116 +135 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/rsyslog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/colo.xml"/>

BOOK/final-system/multilib/util-linux-64bit.xml

@@ -61 +61 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
   </sect2>
 

BOOK/final-system/multilib/util-linux-n32.xml

@@ -58 +58 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
   </sect2>
 

BOOK/final-system/ppc-chapter.xml

@@ -44 +44 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/readline.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/attr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/automake.xml"/>
@@ -60 +61 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iputils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kbd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/less.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dbus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/hfsutils.xml"/>

BOOK/final-system/ppc64-64-chapter.xml

@@ -72 +72 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/hfsutils.xml"/>

BOOK/final-system/ppc64-chapter.xml

@@ -61 +61 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/readline.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/readline-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/attr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/attr-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/automake.xml"/>
@@ -80 +82 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/iputils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kbd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/man.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expat-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dbus.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dbus-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/psmisc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/shadow.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr-64bit.xml"/>
@@ -93 +104 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/rsyslog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/hfsutils.xml"/>

BOOK/final-system/sparc-chapter.xml

@@ -44 +44 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/readline.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/attr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/automake.xml"/>
@@ -60 +61 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iputils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kbd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/less.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dbus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/elftoaout.xml"/>

BOOK/final-system/sparc64-64-chapter.xml

@@ -44 +44 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/readline.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/attr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/automake.xml"/>
@@ -60 +61 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iputils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kbd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/less.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dbus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/elftoaout.xml"/>

BOOK/final-system/sparc64-chapter.xml

@@ -61 +61 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/readline.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/readline-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/attr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/attr-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/automake.xml"/>
@@ -80 +82 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/iputils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kbd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/man.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expat-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dbus.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dbus-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/psmisc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/shadow.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr-64bit.xml"/>
@@ -93 +104 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/rsyslog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/elftoaout.xml"/>

BOOK/final-system/x86-chapter.xml

@@ -44 +44 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/readline.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/attr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/automake.xml"/>
@@ -60 +61 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iputils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kbd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/less.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dbus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/grub.xml"/>

BOOK/final-system/x86_64-64-chapter.xml

@@ -44 +44 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/readline.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/attr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/automake.xml"/>
@@ -60 +61 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iputils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kbd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/less.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dbus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/grub.xml"/>

BOOK/final-system/x86_64-chapter.xml

@@ -61 +61 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/readline.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/readline-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/attr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/attr-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/automake.xml"/>
@@ -80 +82 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/iputils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kbd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/less.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/man.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expat-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dbus.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dbus-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/psmisc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/shadow.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr-64bit.xml"/>
@@ -93 +105 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/rsyslog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/grub.xml"/>

BOOK/general.ent

@@ -13 +13 @@
 <!ENTITY generic-version "git"> <!-- Use "git", "testing", or "x.y.z[-pre{x}]" -->
 
+<!ENTITY versionid "&year;&month;&day;"> <!-- /etc/os-release from systemd -->
 <!ENTITY version "GIT-&year;&month;&day;">
 

BOOK/introduction/common/changelog.xml

@@ -31 +31 @@
         </listitem>
         <listitem>
-          <para>[name] - Another changelog entry.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
+          <para>[name] - Previous changelog entry.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 -->
+
     <listitem>
       <para>01 January 2014</para>

BOOK/materials/common/packages.xml

@@ -16 +16 @@
 
     <varlistentry>
+      <term>Attr (&attr-version;) - <token>&attr-size;</token>:</term>
+      <listitem>
+        <para>Home page: <ulink url="&attr-home;"/></para>
+        <para>Download: <ulink url="&attr-url;"/></para>
+        <para>MD5 sum: <literal>&attr-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>Autoconf (&autoconf-version;) - <token>&autoconf-size;</token>:</term>
       <listitem>
@@ -115 +124 @@
 
     <varlistentry>
+      <term>D-Bus (&dbus-version;) - <token>&dbus-size;</token>:</term>
+      <listitem>
+        <para>Home page: <ulink url="&dbus-home;"/></para>
+        <para>Download: <ulink url="&dbus-url;"/></para>
+        <para>MD5 sum: <literal>&dbus-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>DejaGNU (&dejagnu-version;) - <token>&dejagnu-size;</token>:</term>
       <listitem>
@@ -160 +178 @@
 
     <varlistentry>
-      <term>Eudev (&eudev-version;) - <token>&eudev-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&eudev-home;"/></para>
-        <para>Download: <ulink url="&eudev-url;"/></para>
-        <para>MD5 sum: <literal>&eudev-md5;</literal></para>
+      <term>Expat (&expat-version;) - <token>&expat-size;</token>:</term>
+      <listitem>
+        <para>Home page: <ulink url="&expat-home;"/></para>
+        <para>Download: <ulink url="&expat-url;"/></para>
+        <para>MD5 sum: <literal>&expat-md5;</literal></para>
       </listitem>
     </varlistentry>
@@ -340 +358 @@
 
     <varlistentry>
+      <term>Libcap (&libcap-version;) - <token>&libcap-size;</token>:</term>
+      <listitem>
+        <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>
+
+    <varlistentry>
       <term>Libee (&libee-version;) - <token>&libee-size;</token>:</term>
       <listitem>
@@ -525 +552 @@
         <para>Download: <ulink url="&sysvinit-url;"/></para>
         <para>MD5 sum: <literal>&sysvinit-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>systemd (&systemd-version;) - <token>&systemd-size;</token>:</term>
+      <listitem>
+        <para>Home page: <ulink url="&systemd-home;"/></para>
+        <para>Download: <ulink url="&systemd-url;"/></para>
+        <para>MD5 sum: <literal>&systemd-md5;</literal></para>
       </listitem>
     </varlistentry>

BOOK/packages.ent

@@ -11 +11 @@
 <!ENTITY aboot-md5 "5f16edbf4e9d52cd191adc4d4b6a5327">
 <!ENTITY aboot-home "http://sourceforge.net/projects/aboot">
+
+<!ENTITY attr-version "2.4.44">
+<!ENTITY attr-size "312 KB">
+<!ENTITY attr-url "http://download.savannah.gnu.org/releases/attr/attr-&attr-version;.src.tar.gz">
+<!ENTITY attr-md5 "d132c119831c27350e10b9f885711adc">
+<!ENTITY attr-home "http://acl.bestbits.at/">
 
 <!ENTITY arcload-version "0.5">
@@ -93 +99 @@
 <!ENTITY coreutils-md5 "8fb0ae2267aa6e728958adc38f8163a2">
 <!ENTITY coreutils-home "&gnu-software;coreutils">
+
+<!ENTITY dbus-version "1.4.1">
+<!ENTITY dbus-size "1,808 KB">
+<!ENTITY dbus-url "http://dbus.freedesktop.org/releases/dbus/dbus-&dbus-version;.tar.gz">
+<!ENTITY dbus-md5 "99cb057700c0455fb68f8d57902f77ac">
+<!ENTITY dbus-home "http://www.freedesktop.org/wiki/Software/dbus">
 
 <!ENTITY dejagnu-version "1.5.1">
@@ -139 +151 @@
 <!ENTITY elftoaout-home " ">
 
+<!ENTITY expat-version "2.0.1">
+<!ENTITY expat-size "436 KB">
+<!ENTITY expat-url "&sourceforge;expat/expat-2.0.1.tar.gz">
+<!ENTITY expat-md5 "ee8b492592568805593f81f8cdf2a04c">
+<!ENTITY expat-home " ">
+
 <!ENTITY expect-version "5.45">
 <!ENTITY expect-size "616 KB">
@@ -263 +281 @@
 <!ENTITY less-home "http://www.greenwoodsoftware.com/less">
 
+<!ENTITY libcap-version "2.20">
+<!ENTITY libcap-size "52 KB">
+<!ENTITY libcap-url "&kernel;linux/libs/security/linux-privs/libcap2/libcap-&libcap-version;.tar.bz2">
+<!ENTITY libcap-md5 "10e47ed32ca2214eb0e58780282d27b4">
+<!ENTITY libcap-home "http://sites.google.com/site/fullycapable/">
+
 <!ENTITY libee-version "0.4.1">
 <!ENTITY libee-size "352 KB">
@@ -409 +433 @@
 <!ENTITY sysvinit-md5 "6eda8a97b86e0a6f59dabbf25202aa6f">
 <!ENTITY sysvinit-home "http://savannah.nongnu.org/projects/sysvinit">
+
+<!ENTITY systemd-version "17">
+<!ENTITY systemd-size "738 KB">
+<!ENTITY systemd-url "http://www.freedesktop.org/software/systemd/systemd-&systemd-version;.tar.bz2">
+<!ENTITY systemd-md5 "ae69109af0628c083846b8aea921692c">
+<!ENTITY systemd-home "http://freedesktop.org/wiki/Software/systemd">
 
 <!ENTITY tar-version "1.27.1">

BOOK/users_groups.ent

@@ -8 +8 @@
 <!ENTITY uid-adm "3">
 <!ENTITY uid-lp "10">
+<!ENTITY uid-messagebus "27">
 <!ENTITY uid-mail "30">
 <!ENTITY uid-news "31">
@@ -35 +36 @@
 <!ENTITY gid-console "17">
 <!ENTITY gid-cdrw "18">
+<!ENTITY gid-messagebus "27">
 <!ENTITY gid-mail "30">
 <!ENTITY gid-news "31">