From 777b5cbc8e6cfcbc0df9b8cd691775b8255b5964 Mon Sep 17 00:00:00 2001
From: "Douglas R. Reno" <renodr@linuxfromscratch.org>
Date: Fri, 4 Oct 2019 02:24:52 +0000
Subject: Add a consolidated patch to fix several bugs in systemd.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11680 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 13 +++++++++++++
 chapter03/patches.xml   |  6 +++---
 chapter06/systemd.xml   | 23 ++++++++++++++++++-----
 general.ent             |  6 +++---
 patches.ent             |  6 +++---
 5 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 3f0064075..4401e378c 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -42,6 +42,19 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
        -->
+    <listitem revision="systemd">
+      <para>2019-10-03</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Add a consolidated patch to fix several
+          problems with the new version of systemd, including bugs
+          in udev, filesystem mounting (with Samba-4.11), hardware
+          database updates, timesync fixes with adjtime as is set
+          in LFS, and bugs with network management and domain
+          resolution.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
       <para>2019-09-29</para>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 79fefcf61..d351509a3 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -118,10 +118,10 @@
     </varlistentry>
 
     <varlistentry revision="systemd">
-      <term>Systemd udev evdev fix - <token>&systemd-udev-patch-size;</token>:</term>
+      <term>Systemd Consolidated Patch - <token>&systemd-consolidated-patch-size;</token>:</term>
       <listitem>
-        <para>Download: <ulink url="&patches-root;&systemd-udev-patch;"/></para>
-        <para>MD5 sum: <literal>&systemd-udev-patch-md5;</literal></para>
+        <para>Download: <ulink url="&patches-root;&systemd-consolidated-patch;"/></para>
+        <para>MD5 sum: <literal>&systemd-consolidated-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
 
diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml
index 8f6d1287e..e9e2a9476 100644
--- a/chapter06/systemd.xml
+++ b/chapter06/systemd.xml
@@ -40,10 +40,10 @@
   <sect2 role="installation">
     <title>Installation of systemd</title>
 
-    <para>First, apply a patch to fix issues with udev and evdev
-    device node assignment:</para>
+    <para>First, apply a patch to fix various bugs since the release
+    of systemd-243.</para>
 
-<screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-udev_fix-1.patch</userinput></screen>
+<screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-consolidated_fixes-1.patch</userinput></screen>
 
     <para>Create a symlink to work around missing xsltproc:</para>
 
@@ -207,8 +207,21 @@ meson --prefix=/usr                \
     <para>Setup the basic target structure:</para>
 
 <screen><userinput remap="adjust">systemctl preset-all</userinput></screen>
-             
-    <para>Remove symbolic links to Util-Linux libraries:</para>
+
+    <para>Disable a service that is known to cause problems with systems that
+    use a network configuration other than what is provided by
+    systemd-networkd:</para>
+    <!-- Observed halting startup with dhcpcd handling the primary NIC -->
+ 
+<screen><userinput remap="adjust">systemctl disable systemd-time-wait-sync.service</userinput></screen>
+
+    <para>Prevent systemd from resetting the maximum PID value which causes
+    some problems with packages and units in BLFS:</para>
+    <!-- FCRON in particular -->
+
+<screen><userinput remap="adjust">rm -f /etc/sysctl.d/50-pid-max.conf</userinput></screen>
+
+    <para>Cleanup symbolic links to Util-Linux libraries:</para>
 
 <screen><userinput remap="adjust">rm -fv /usr/lib/lib{blkid,uuid,mount}.so*</userinput></screen>
 
diff --git a/general.ent b/general.ent
index d23bd5338..061a92e02 100644
--- a/general.ent
+++ b/general.ent
@@ -1,13 +1,13 @@
-<!ENTITY version         "SVN-20190929">
+<!ENTITY version         "SVN-20191003">
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book; 
                                       Change to x.y for release but not -rc releases -->
 <!ENTITY generic-version "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
 
-<!ENTITY versiond        "20190929-systemd">
+<!ENTITY versiond        "20191003-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "September 29th, 2019">
+<!ENTITY releasedate     "October 3rd, 2019">
 
 <!ENTITY copyrightdate   "1999-2019"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "9.0">
diff --git a/patches.ent b/patches.ent
index 6addb0fb1..26ec12446 100644
--- a/patches.ent
+++ b/patches.ent
@@ -57,7 +57,7 @@
 <!ENTITY sysvinit-consolidated-patch-md5 "4900322141d493e74020c9cf437b2cdc">
 <!ENTITY sysvinit-consolidated-patch-size "2.4 KB">
 
-<!ENTITY systemd-udev-patch "systemd-&systemd-version;-udev_fix-1.patch">
-<!ENTITY systemd-udev-patch-md5 "91e4cd41dee57dc6ac9817b8f4f724a6">
-<!ENTITY systemd-udev-patch-size "12 KB">
+<!ENTITY systemd-consolidated-patch "systemd-&systemd-version;-consolidated_fixes-1.patch">
+<!ENTITY systemd-consolidated-patch-md5 "d1f60dcbd53222eecfc58e4e95ef60ab">
+<!ENTITY systemd-consolidated-patch-size "60 KB">
 
-- 
cgit v1.2.3-54-g00ecf