diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index 481c9938c..8d6883cb0 100644
--- a/appendices/dependencies.xml
+++ b/appendices/dependencies.xml
@@ -420,7 +420,7 @@
&before;
- Bash, Diffutils, Findutils, Man-DB, and Udev
+ Bash, Diffutils, Findutils, Man-DB, and Systemd
@@ -2271,7 +2271,7 @@
Bash, Binutils, Coreutils, Diffutils, Findutils, Gawk, GCC,
- Gettext, Glibc, Grep, Make, Ncurses, Sed, Udev, and Zlib
+ Gettext, Glibc, Grep, Make, Ncurses, Sed, Systemd, and Zlib
@@ -2393,7 +2393,7 @@
&before;
- GRUB, Kmod, Man-DB, Udev
+ GRUB, Kmod, Man-DB, Systemd
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index a37bdd83c..d0676e951 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,21 @@
-->
+
+ 2016-01-02
+
+
+ [dj] - Fix build of systemd with libblkid and libmount in
+ /tools/lib and move util-linux to its previous build order to
+ solve reciprocal dependency.
+
+
+ [dj] - Removed /etc/resolv.conf symlink in network
+ configuration as it is created automatically if needed.
+
+
+
+
2016-01-01
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index ddfd2c853..d08135f7e 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -58,7 +58,6 @@
-
@@ -76,6 +75,7 @@
+
diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml
index 7a2f821ea..17ddda598 100644
--- a/chapter06/systemd.xml
+++ b/chapter06/systemd.xml
@@ -40,7 +40,29 @@
Installation of systemd
- First, create a file to allow systemd to build when using Util-Linux
+ First, fix a build error when using Util-Linux built in
+ Chapter 5:
+
+sed -i "s:blkid/::" $(grep -rl "blkid/blkid.h")
+
+ Apply the following patch so that compat
+ pkg-config files get installed without installing compat
+ libs which are useless on LFS:
+
+patch -Np1 -i ../&systemd-compat-patch;
+
+ Disable two tests that always fail:
+
+sed -e 's:test/udev-test.pl ::g' \
+ -e 's:test-copy$(EXEEXT) ::g' \
+ -i Makefile.in
+
+ Rebuild generated files after modifying Makefile.am and
+ Makefile.in:
+
+autoreconf -fi
+
+ Create a file to allow systemd to build when using Util-Linux
built in Chapter 5, to disable LTO by default, and to build without
xlstproc:
@@ -58,26 +80,10 @@ cc_cv_CFLAGS__flto=no
XSLTPROC="/usr/bin/xsltproc"
EOF
- LTO is disabled by default because it causes systemd
- and other auxiliary programs to link to libgcc_s.so, slows the build down and makes the
- compiled code larger.
-
- Additionally, fix a build error when using Util-Linux built in
- Chapter 5:
-
-sed -i "s:blkid/::" $(grep -rl "blkid/blkid.h")
-
- Apply the following patch so that compat pkg-config files
- get installed without installing compat libs which are useless on LFS:
-
-patch -Np1 -i ../&systemd-compat-patch;
-
- Disable two tests that always fail:
-
-sed -e 's:test/udev-test.pl ::g' \
- -e 's:test-copy$(EXEEXT) ::g' \
- -i Makefile.in
+ LTO is disabled by default because it causes
+ systemd and other auxiliary programs to link to
+ libgcc_s.so, slows the build down
+ and makes the compiled code larger.
Prepare systemd for compilation:
diff --git a/chapter07/network.xml b/chapter07/network.xml
index 7dc86cbf5..39055a8ca 100644
--- a/chapter07/network.xml
+++ b/chapter07/network.xml
@@ -115,16 +115,9 @@ EOF
When using systemd-resolved for DNS
configuration, it is responsible for creating the
- /etc/resolv.conf file, which is placed in a
- non-standard location that is writable during early boot. In order to be
- used by other components of the system, it is necessary to create a
- symlink with the following command:
-
-ln -sfv /run/systemd/resolve/resolv.conf /etc/resolv.conf
-
- This is required if you are specifying DNS entries in .network files or using the built in
- DHCP client to obtain DNS addresses.
+ /etc/resolv.conf file. Since version 226, the
+ symlink for /etc/resolv.conf is created by systemd
+ when needed, so no further configuration is necessary.
diff --git a/general.ent b/general.ent
index 0df651f32..9b3cd7d97 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
-
+
-
+