Index: BOOK/final-system/alpha-chapter.xml
===================================================================
--- BOOK/final-system/alpha-chapter.xml	(revision af0fe7f7d25fe5089dc5ab0e668fc19058fa2059)
+++ BOOK/final-system/alpha-chapter.xml	(revision d89bf75ccd75fd0f91952f18ee56aea3f4c35af2)
@@ -69,7 +69,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/shadow.xml"/>
-<!-- systemd -->
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/rsyslog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
Index: BOOK/final-system/common/systemd.xml
===================================================================
--- BOOK/final-system/common/systemd.xml	(revision d89bf75ccd75fd0f91952f18ee56aea3f4c35af2)
+++ BOOK/final-system/common/systemd.xml	(revision d89bf75ccd75fd0f91952f18ee56aea3f4c35af2)
@@ -0,0 +1,226 @@
+<?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-systemd" role="wrap">
+  <?dbhtml filename="systemd.html"?>
+
+  <title>systemd-&systemd-version;</title>
+
+  <indexterm zone="ch-system-systemd">
+    <primary sortas="a-systemd">systemd</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para><command>systemd</command> is a system and service manager for Linux
+    operating systems.</para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of systemd</title>
+
+    <para os="s1">By default, <command>systemd</command> contains a unit file
+    that mounts a tmpfs over /var/lock on boot as 775 with a gid of lock. CLFS
+    does not have a lock group. Change this to 777 with the following
+    command:</para>
+
+<screen os="s2"><userinput>sed -i "s/\(mode\)=775,gid=lock/\1=777/" \
+    units/var-lock.mount</userinput></screen>
+
+    <para os="a">Prepare systemd for compilation:</para>
+
+<screen os="b"><userinput>./configure --prefix=/usr \
+    --sysconfdir=/etc --localstatedir=/var \
+    --with-rootdir= --with-distro=other \
+    --with-syslog-service=rsyslog.service \
+    --with-sysvinit-path=/etc/init.d \
+    --with-sysvrcd-path=/etc/rc.d</userinput></screen>
+
+    <para os="c">Compile the package:</para>
+
+<screen os="d"><userinput>make</userinput></screen>
+
+    <para os="e">Install the package:</para>
+
+<screen os="f"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 id="conf-systemd" role="configuration">
+    <title>Configuring systemd</title>
+
+    <indexterm zone="conf-systemd">
+      <primary sortas="a-systemd">systemd</primary>
+    <secondary>configuring</secondary></indexterm>
+
+    <indexterm zone="conf-systemd">
+      <primary sortas="e-/etc/os-release">/etc/os-release</primary>
+    </indexterm>
+
+    <para>Create a file to identify the operating system.
+    <command>systemd</command> will use this file on boot to put information
+    on the screen.</para>
+
+<screen><userinput>cat &gt; /etc/os-release &lt;&lt; "EOF"
+# Begin /etc/os-release
+
+NAME=Cross-LFS
+ID=clfs
+
+PRETTY_NAME=Cross Linux From Scratch
+ANSI_COLOR=0;33
+
+VERSION=&version;
+VERSION_ID=&versionid;
+
+# End /etc/os-release
+EOF</userinput></screen>
+
+  </sect2>
+
+  <sect2 id="contents-systemd" role="content">
+    <title>Contents of systemd</title>
+
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+      <segtitle>Installed libraries</segtitle>
+      <segtitle>Installed directories</segtitle>
+
+      <seglistitem>
+        <seg>systemctl, systemd, systemd-ask-password, systemd-cgls,
+        systemd-notify, systemd-tty-ask-password-agent</seg>
+        <seg>pam_systemd</seg>
+        <seg>/lib/systemd, /etc/systemd, /etc/tmpfiles.d,
+        /usr/share/systemd</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="systemctl">
+        <term><command>systemctl</command></term>
+        <listitem>
+          <para>Control the systemd system and service manager</para>
+          <indexterm zone="ch-system-systemd systemctl">
+            <primary sortas="b-systemctl">systemctl</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="systemd">
+        <term><command>systemd</command></term>
+        <listitem>
+          <para>System and service manager for Linux</para>
+          <indexterm zone="ch-system-systemd systemd">
+            <primary sortas="b-systemd">systemd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="systemd-ask-password">
+        <term><command>systemd-ask-password</command></term>
+        <listitem>
+          <para>Queries the user for a system passphrase, via the
+          TTY or an UI agent.</para>
+          <indexterm zone="ch-system-systemd systemd-ask-password">
+            <primary sortas="b-systemd-ask-password">systemd-ask-password</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="systemd-cgls">
+        <term><command>systemd-cgls</command></term>
+        <listitem>
+          <para>Recursively shows control group contents</para>
+          <indexterm zone="ch-system-systemd systemd-cgls">
+            <primary sortas="b-systemd-cgls">systemd-cgls</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="systemd-notify">
+        <term><command>systemd-notify</command></term>
+        <listitem>
+          <para>Notify init system about start-up completion and other daemon
+          status changes</para>
+          <indexterm zone="ch-system-systemd systemd-notify">
+            <primary sortas="b-systemd-notify">systemd-notify</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="systemd-tty-ask-password-agent">
+        <term><command>systemd-tty-ask-password-agent</command></term>
+        <listitem>
+          <para>Process system password requests</para>
+          <indexterm zone="ch-system-systemd systemd-tty-ask-password-agent">
+            <primary sortas="b-systemd-tty-ask-password-agent">systemd-tty-ask-password-agent</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pam_systemd">
+        <term><filename class="libraryfile">pam_systemd</filename></term>
+        <listitem>
+          <para>Register user sessions in the systemd control group
+          hierarchy</para>
+          <indexterm zone="ch-system-systemd pam_systemd">
+            <primary sortas="c-pam_systemd">pam_systemd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="lib-systemd">
+        <term><filename class="directory">/lib/systemd</filename></term>
+        <listitem>
+          <para>Location of system units and configurations</para>
+          <indexterm zone="ch-system-systemd lib-systemd">
+            <primary sortas="e-/lib/systemd">/lib/systemd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="etc-systemd">
+        <term><filename class="directory">/etc/systemd</filename></term>
+        <listitem>
+          <para>Location of user units and configurations</para>
+          <indexterm zone="ch-system-systemd etc-systemd">
+            <primary sortas="e-/etc/systemd">/etc/systemd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="etc-tmpfilesd">
+        <term><filename class="directory">/etc/tmpfiles.d</filename></term>
+        <listitem>
+          <para>Configuration for creation, deletion and cleaning of temporary
+          and volatile files</para>
+          <indexterm zone="ch-system-systemd etc-tmpfilesd">
+            <primary sortas="e-/etc/tmpfiles.d">/etc/tmpfiles.d</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="usr-share-systemd">
+        <term><filename class="directory">/usr/share/systemd</filename></term>
+        <listitem>
+          <para>Location of session unit files</para>
+          <indexterm zone="ch-system-systemd usr-share-systemd">
+            <primary sortas="e-/usr/share/systemd">/usr/share/systemd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: BOOK/final-system/mips-chapter.xml
===================================================================
--- BOOK/final-system/mips-chapter.xml	(revision af0fe7f7d25fe5089dc5ab0e668fc19058fa2059)
+++ BOOK/final-system/mips-chapter.xml	(revision d89bf75ccd75fd0f91952f18ee56aea3f4c35af2)
@@ -69,7 +69,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/shadow.xml"/>
-<!-- systemd -->
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/rsyslog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
Index: BOOK/final-system/mips64-64-chapter.xml
===================================================================
--- BOOK/final-system/mips64-64-chapter.xml	(revision af0fe7f7d25fe5089dc5ab0e668fc19058fa2059)
+++ BOOK/final-system/mips64-64-chapter.xml	(revision d89bf75ccd75fd0f91952f18ee56aea3f4c35af2)
@@ -69,7 +69,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/shadow.xml"/>
-<!-- systemd -->
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/rsyslog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
Index: BOOK/final-system/mips64-chapter.xml
===================================================================
--- BOOK/final-system/mips64-chapter.xml	(revision af0fe7f7d25fe5089dc5ab0e668fc19058fa2059)
+++ BOOK/final-system/mips64-chapter.xml	(revision d89bf75ccd75fd0f91952f18ee56aea3f4c35af2)
@@ -118,7 +118,8 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/shadow.xml"/>
-<!-- systemd -->
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/systemd-n32.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/systemd-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/rsyslog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/texinfo.xml"/>
Index: BOOK/final-system/multilib/systemd-64bit.xml
===================================================================
--- BOOK/final-system/multilib/systemd-64bit.xml	(revision d89bf75ccd75fd0f91952f18ee56aea3f4c35af2)
+++ BOOK/final-system/multilib/systemd-64bit.xml	(revision d89bf75ccd75fd0f91952f18ee56aea3f4c35af2)
@@ -0,0 +1,69 @@
+<?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-systemd" role="wrap">
+  <?dbhtml filename="systemd-64bit.html"?>
+
+  <title>systemd-&systemd-version;</title>
+
+  <indexterm zone="ch-system-systemd">
+    <primary sortas="a-systemd">systemd</primary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/systemd.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of systemd</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>CC="gcc ${BUILD64}" PKG_CONFIG_PATH="${PKG_CONFIG_PATH64}" \
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc --localstatedir=/var \
+    --with-rootdir= --with-distro=other \
+    --with-syslog-service=rsyslog.service \
+    --with-sysvinit-path=/etc/init.d \
+    --with-sysvrcd-path=/etc/rc.d</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+  </sect2>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/systemd.xml"
+  xpointer="xpointer(id('conf-systemd'))"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/systemd.xml"
+  xpointer="xpointer(id('contents-systemd'))"/>
+
+</sect1>
Index: BOOK/final-system/multilib/systemd-n32.xml
===================================================================
--- BOOK/final-system/multilib/systemd-n32.xml	(revision d89bf75ccd75fd0f91952f18ee56aea3f4c35af2)
+++ BOOK/final-system/multilib/systemd-n32.xml	(revision d89bf75ccd75fd0f91952f18ee56aea3f4c35af2)
@@ -0,0 +1,66 @@
+<?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-systemd-n32" role="wrap">
+  <?dbhtml filename="systemd-n32.html"?>
+
+  <title>systemd-&systemd-version; N32 Libraries</title>
+
+  <indexterm zone="ch-system-systemd-n32">
+    <primary sortas="a-systemd">systemd</primary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/systemd.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of systemd</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="systemd.xml"
+    xpointer="xpointer(//*[@os='mlw1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="systemd.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>CC="gcc ${BUILDN32}" PKG_CONFIG_PATH="${PKG_CONFIG_PATHN32}" \
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc --localstatedir=/var \
+    --with-rootdir= --with-distro=other \
+    --with-syslog-service=rsyslog.service \
+    --with-sysvinit-path=/etc/init.d \
+    --with-sysvrcd-path=/etc/rc.d</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="systemd.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="systemd.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="systemd.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="systemd.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-systemd" role="."/></para>
+
+  </sect2>
+
+</sect1>
Index: BOOK/final-system/multilib/systemd.xml
===================================================================
--- BOOK/final-system/multilib/systemd.xml	(revision d89bf75ccd75fd0f91952f18ee56aea3f4c35af2)
+++ BOOK/final-system/multilib/systemd.xml	(revision d89bf75ccd75fd0f91952f18ee56aea3f4c35af2)
@@ -0,0 +1,67 @@
+<?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-systemd-32" role="wrap">
+  <?dbhtml filename="systemd.html"?>
+
+  <title>systemd-&systemd-version; 32 Bit Libraries</title>
+
+  <indexterm zone="ch-system-systemd-32">
+    <primary sortas="a-systemd">systemd</primary>
+    <secondary>32 Bit</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/systemd.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of systemd</title>
+
+    <note os="mlw1">
+      <para>If you do not have Linux-PAM installed in your system you can safely
+      skip this page. If you do have Linux-PAM installed and you wish to use
+      <filename class="libraryfile">pam_systemd.so</filename>
+      to register and control user sessions within the systemd control group
+      hierarchy, follow the instructions to install the module.</para>
+    </note>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>CC="gcc ${BUILD32}" PKG_CONFIG_PATH="${PKG_CONFIG_PATH32}" \
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc --localstatedir=/var \
+    --with-rootdir= --with-distro=other \
+    --with-syslog-service=rsyslog.service \
+    --with-sysvinit-path=/etc/init.d \
+    --with-sysvrcd-path=/etc/rc.d</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+<screen os="d"><userinput>make pam_systemd.la</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+<screen os="f"><userinput>make install-pamlibLTLIBRARIES</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-systemd" role="."/></para>
+
+  </sect2>
+
+</sect1>
Index: BOOK/final-system/ppc-chapter.xml
===================================================================
--- BOOK/final-system/ppc-chapter.xml	(revision af0fe7f7d25fe5089dc5ab0e668fc19058fa2059)
+++ BOOK/final-system/ppc-chapter.xml	(revision d89bf75ccd75fd0f91952f18ee56aea3f4c35af2)
@@ -69,7 +69,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/shadow.xml"/>
-<!-- systemd -->
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/rsyslog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
Index: BOOK/final-system/ppc64-chapter.xml
===================================================================
--- BOOK/final-system/ppc64-chapter.xml	(revision af0fe7f7d25fe5089dc5ab0e668fc19058fa2059)
+++ BOOK/final-system/ppc64-chapter.xml	(revision d89bf75ccd75fd0f91952f18ee56aea3f4c35af2)
@@ -94,7 +94,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/shadow.xml"/>
-<!-- systemd -->
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/systemd-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/rsyslog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/texinfo.xml"/>
Index: BOOK/final-system/sparc-chapter.xml
===================================================================
--- BOOK/final-system/sparc-chapter.xml	(revision af0fe7f7d25fe5089dc5ab0e668fc19058fa2059)
+++ BOOK/final-system/sparc-chapter.xml	(revision d89bf75ccd75fd0f91952f18ee56aea3f4c35af2)
@@ -69,7 +69,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/shadow.xml"/>
-<!-- systemd -->
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/rsyslog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
Index: BOOK/final-system/sparc64-64-chapter.xml
===================================================================
--- BOOK/final-system/sparc64-64-chapter.xml	(revision af0fe7f7d25fe5089dc5ab0e668fc19058fa2059)
+++ BOOK/final-system/sparc64-64-chapter.xml	(revision d89bf75ccd75fd0f91952f18ee56aea3f4c35af2)
@@ -69,7 +69,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/shadow.xml"/>
-<!-- systemd -->
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/rsyslog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
Index: BOOK/final-system/sparc64-chapter.xml
===================================================================
--- BOOK/final-system/sparc64-chapter.xml	(revision af0fe7f7d25fe5089dc5ab0e668fc19058fa2059)
+++ BOOK/final-system/sparc64-chapter.xml	(revision d89bf75ccd75fd0f91952f18ee56aea3f4c35af2)
@@ -94,7 +94,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/shadow.xml"/>
-<!-- systemd -->
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/systemd-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/rsyslog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/texinfo.xml"/>
Index: BOOK/final-system/x86-chapter.xml
===================================================================
--- BOOK/final-system/x86-chapter.xml	(revision af0fe7f7d25fe5089dc5ab0e668fc19058fa2059)
+++ BOOK/final-system/x86-chapter.xml	(revision d89bf75ccd75fd0f91952f18ee56aea3f4c35af2)
@@ -69,7 +69,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/shadow.xml"/>
-<!-- systemd -->
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/rsyslog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
Index: BOOK/final-system/x86_64-64-chapter.xml
===================================================================
--- BOOK/final-system/x86_64-64-chapter.xml	(revision af0fe7f7d25fe5089dc5ab0e668fc19058fa2059)
+++ BOOK/final-system/x86_64-64-chapter.xml	(revision d89bf75ccd75fd0f91952f18ee56aea3f4c35af2)
@@ -69,7 +69,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/shadow.xml"/>
-<!-- systemd -->
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/rsyslog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
Index: BOOK/final-system/x86_64-chapter.xml
===================================================================
--- BOOK/final-system/x86_64-chapter.xml	(revision af0fe7f7d25fe5089dc5ab0e668fc19058fa2059)
+++ BOOK/final-system/x86_64-chapter.xml	(revision d89bf75ccd75fd0f91952f18ee56aea3f4c35af2)
@@ -94,7 +94,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/shadow.xml"/>
-<!-- systemd -->
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/systemd-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/rsyslog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/texinfo.xml"/>
Index: BOOK/general.ent
===================================================================
--- BOOK/general.ent	(revision af0fe7f7d25fe5089dc5ab0e668fc19058fa2059)
+++ BOOK/general.ent	(revision d89bf75ccd75fd0f91952f18ee56aea3f4c35af2)
@@ -13,4 +13,5 @@
 <!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;">
 
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision af0fe7f7d25fe5089dc5ab0e668fc19058fa2059)
+++ BOOK/introduction/common/changelog.xml	(revision d89bf75ccd75fd0f91952f18ee56aea3f4c35af2)
@@ -36,4 +36,14 @@
     </listitem>
 -->
+
+    <listitem>
+      <para>February 13, 2011</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jciccone] - Added systemd and changed the appropriate
+          configuration pages.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
