diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 1897917ce..a1b5928d2 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -36,6 +36,15 @@ --> + + 2015-06-28 + + + [krejzi] - Updated to systemd-221. + + + + 2015-06-23 diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml index f62aad85a..3c5eab72f 100644 --- a/chapter06/systemd.xml +++ b/chapter06/systemd.xml @@ -45,6 +45,8 @@ cat > config.cache << "EOF" KILL=/bin/kill +MOUNT_PATH=/bin/mount +UMOUNT_PATH=/bin/umount HAVE_BLKID=1 BLKID_LIBS="-lblkid" BLKID_CFLAGS="-I/tools/include/blkid" @@ -69,9 +71,11 @@ EOF patch -Np1 -i ../&systemd-compat-patch; - Disable a test case that always fails: + Disable two tests that always fail: -sed -i "s:test/udev-test.pl ::g" Makefile.in +sed -e 's:test/udev-test.pl ::g' \ + -e 's:test-copy$(EXEEXT) ::g' \ + -i Makefile.in Prepare systemd for compilation: @@ -82,7 +86,6 @@ EOF --with-rootprefix= \ --with-rootlibdir=/lib \ --enable-split-usr \ - --disable-gudev \ --disable-firstboot \ --disable-ldconfig \ --disable-sysusers \ @@ -123,10 +126,11 @@ EOF - --disable-gudev --without-python + --without-python - These switches disable optional features because - LFS does not provide their dependencies. + This switch prevents configure + from trying to use Python since it's not part + of LFS. @@ -199,12 +203,9 @@ EOF done ln -sfv ../lib/systemd/systemd /sbin/init - Remove a reference to a non-existent group and fix - a configuration file so it doesn't cause - systemd-tmpfiles to fail at boot: + Remove a reference to a non-existent group: -sed -i "s:0775 root lock:0755 root root:g" /usr/lib/tmpfiles.d/legacy.conf -sed -i "/pam.d/d" /usr/lib/tmpfiles.d/etc.conf +sed -i "s:0775 root lock:0755 root root:g" /usr/lib/tmpfiles.d/legacy.conf Create the /etc/machine-id file needed by systemd-journald: diff --git a/packages.ent b/packages.ent index d15561b7f..885f53adc 100644 --- a/packages.ent +++ b/packages.ent @@ -525,13 +525,13 @@ - - + + - + - - + +