diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index ac0aa8d8b..a666aff0a 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -43,6 +43,21 @@
appropriate for the entry or if needed the entire day's listitem.
-->
+
+ 2018-09-30
+
+
+ [dj] - Restore build of Util-Linux in chapter5 to avoid
+ reciprocal dependency for Systemd.
+
+
+ [dj] - Moved installation of Util-Linux and E2fsprogs after
+ Procps to satisfy build order in the Systemd book. This has no effect
+ on the SysV book.
+
+
+
+
2018-09-20
diff --git a/chapter05/chapter05.xml b/chapter05/chapter05.xml
index 1951fde7e..8fe5a0870 100644
--- a/chapter05/chapter05.xml
+++ b/chapter05/chapter05.xml
@@ -43,7 +43,7 @@
-
+
diff --git a/chapter05/util-linux.xml b/chapter05/util-linux.xml
index db0bc3261..5cda1f60b 100644
--- a/chapter05/util-linux.xml
+++ b/chapter05/util-linux.xml
@@ -5,7 +5,7 @@
%general-entities;
]>
-
+
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index 79212653c..d6025c52a 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -78,8 +78,6 @@
-
-
@@ -88,8 +86,11 @@
-
+
+
+
+
diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml
index e5d89b833..0db60770f 100644
--- a/chapter06/systemd.xml
+++ b/chapter06/systemd.xml
@@ -44,6 +44,13 @@
ln -sf /tools/bin/true /usr/bin/xsltproc
+ Because we have not yet installed the final version of Util-Linux,
+ create links to the libraries in the approprite location:
+
+for file in /tools/lib64/lib{blkid,mount,uuid}*; do
+ ln -sf $file /usr/lib/
+done
+
Set up the man pages:
tar -xf ../systemd-man-pages-&systemd-version;.tar.xz
@@ -67,6 +74,7 @@
mkdir -p build
cd build
+PKG_CONFIG_PATH="/usr/lib/pkgconfig:/tools/lib64/pkgconfig" \
LANG=en_US.UTF-8 \
meson --prefix=/usr \
--sysconfdir=/etc \
diff --git a/general.ent b/general.ent
index 293f0639f..f2c6d7f60 100644
--- a/general.ent
+++ b/general.ent
@@ -1,13 +1,13 @@
-
+
-
+
-
+