From eb460c5f3ae05a7be720cce73355e465b255ab40 Mon Sep 17 00:00:00 2001
From: Krejzi <krejzi@linuxfromscratch.org>
Date: Sat, 18 May 2013 18:03:06 +0000
Subject: [PATCH] Update Systemd page for 204.

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd/BOOK@10285 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml |  3 +++
 chapter06/dbus.xml      |  2 +-
 chapter06/systemd.xml   | 34 ++++++++++++++++++++++------------
 3 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 14fabb10d..83a7bf33f 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -45,6 +45,9 @@
           <para>[krejzi] - Add temporary libdbus package to satisfy
           circular depdendency between Systemd and D-Bus.</para>
         </listitem>
+        <listitem>
+          <para>[krejzi] - Updated Systemd instructions for version 204.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
 
diff --git a/chapter06/dbus.xml b/chapter06/dbus.xml
index bb0ea73f4..9939ac269 100644
--- a/chapter06/dbus.xml
+++ b/chapter06/dbus.xml
@@ -90,7 +90,7 @@
 
 <screen><userinput remap="install">make install</userinput></screen>
 
-    <para>Create a symlink, so that DBus and Systemd can use the same
+    <para>Create a symlink, so that D-Bus and Systemd can use the same
     <filename>machine-id</filename> file:</para>
 
 <screen><userinput>ln -s /etc/machine-id /var/lib/dbus</userinput></screen>
diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml
index ea7e0fbac..a28b27c00 100644
--- a/chapter06/systemd.xml
+++ b/chapter06/systemd.xml
@@ -49,8 +49,7 @@
             --docdir=/usr/share/doc/systemd-&systemd-version; \
             --with-rootprefix= \
             --with-rootlibdir=/lib \
-            --with-kbd-loadkeys=/bin/loadkeys \
-            --with-kbd-setfont=/bin/setfont \
+            --with-firmware-path="/lib/firmware/updates:/lib/firmware" \
             --enable-split-usr \
             --disable-gudev \
             --without-python</userinput></screen>
@@ -68,10 +67,10 @@
       </varlistentry>
 
       <varlistentry>
-        <term><parameter>--with-kbd-*</parameter></term>
+        <term><parameter>--with-firmware-path=...</parameter></term>
         <listitem>
-          <para>These switches tell Systemd where to find
-          Kbd programs.</para>
+          <para>This switch enables Udev firmware loader and
+          sets the default firmware search path.</para>
         </listitem>
       </varlistentry>
 
@@ -133,22 +132,22 @@ ln -sfv ../lib/systemd/systemd /sbin/init</userinput></screen>
       <segtitle>Installed directories</segtitle>
 
       <seglistitem>
-        <seg>halt, hostnamectl, init, journalctl, localectl, loginctl,
-        poweroff, reboot, runlevel, shutdown, systemctl, systemd-analyze,
-        systemd-ask-password, systemd-cat, systemd-cgls, systemd-cgtop,
-        systemd-coredumpctl, systemd-delta, systemd-detect-virt,
+        <seg>halt, hostnamectl, init, journalctl, kernel-install, localectl,
+        loginctl, poweroff, reboot, runlevel, shutdown, systemctl,
+        systemd-analyze, systemd-ask-password, systemd-cat, systemd-cgls,
+        systemd-cgtop, systemd-coredumpctl, systemd-delta, systemd-detect-virt,
         systemd-inhibit, systemd-machine-id-setup, systemd-notify,
         systemd-nspawn, systemd-stdio-bridge, systemd-tmpfiles,
         systemd-tty-ask-password-agent, telinit, timedatectl and
         udevadm</seg>
         <seg>libnss_myhostname.so.2, libsystemd-daemon.so, libsystemd-id128.so,
         libsystemd-journal.so, libsystemd-login.so and libudev.so</seg>
-        <seg>/etc/binfmt.d, /etc/init.d, /etc/modules-load.d, /etc/rpm,
+        <seg>/etc/binfmt.d, /etc/init.d, /etc/kernel, /etc/modules-load.d, /etc/rpm,
         /etc/sysctl.d, /etc/systemd, /etc/tmpfiles.d, /etc/udev,
         /etc/xdg/systemd, /lib/systemd, /lib/udev, /usr/include/systemd,
-        /usr/lib/binfmt.d, /usr/lib/modules-load.d, /usr/lib/sysctl.d,
+        /usr/lib/binfmt.d, /usr/lib/kernel, /usr/lib/modules-load.d, /usr/lib/sysctl.d,
         /usr/lib/systemd, /usr/lib/tmpfiles.d, /usr/share/doc/systemd-&systemd-version;,
-        /usr/share/systemd, /var/lib/systemd and /var/log/journald</seg>
+        /usr/share/systemd, /var/lib/systemd and /var/log/journal</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -204,6 +203,17 @@ ln -sfv ../lib/systemd/systemd /sbin/init</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="kernel-install">
+        <term><command>kernel-install</command></term>
+        <listitem>
+          <para>used to add and remove kernel and initramfs images to and
+          from /boot.</para>
+          <indexterm zone="ch-system-systemd kernel-install">
+            <primary sortas="b-kernel-install">kernel-install</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="localectl">
         <term><command>localectl</command></term>
         <listitem>