From 7dcd8c782bab203dcba04013f4ecc6846a12bd93 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Sat, 29 Jul 2023 09:51:28 +0800
Subject: [PATCH 1/4] systemd: Remove sed unneeded with 254

---
 chapter08/systemd.xml | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/chapter08/systemd.xml b/chapter08/systemd.xml
index e99167d07..c71616725 100644
--- a/chapter08/systemd.xml
+++ b/chapter08/systemd.xml
@@ -40,19 +40,6 @@
   <sect2 role="installation">
     <title>Installation of systemd</title>
 
-    <para>
-      Remove several inappropriate uses of the <literal>pure</literal>
-      attribute that cause runtime issues when the package is built
-      with gcc-13 or later:
-    </para>
-
-<screen><userinput remap='pre'>sed '/bus_message_type_from_string/s/_pure_//' \
-    -i src/libsystemd/sd-bus/bus-internal.h    &amp;&amp;
-sed '/devt_hash_func/s/_pure_//'               \
-    -i src/basic/hash-funcs.h                  &amp;&amp;
-sed '/job_get_timeout/s/_pure_//'              \
-    -i src/core/job.h</userinput></screen>
-
     <para>Remove two unneeded groups,
     <systemitem class="groupname">render</systemitem> and
     <systemitem class="groupname">sgx</systemitem>, from the default udev

From 57f16783edb41bf517c52d453278f5b3b4bac434 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Sat, 29 Jul 2023 09:53:44 +0800
Subject: [PATCH 2/4] systemd: Add --no-same-owner for man page extraction

Well, I forgot to create the man pages tarball as root, so if we don't
use --no-same-owner the man pages will be owned by UID 1000 :(.

Instead of regenerating the tarball again let's just fix this in the
book.
---
 chapter08/systemd.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/chapter08/systemd.xml b/chapter08/systemd.xml
index c71616725..eb8ea77b0 100644
--- a/chapter08/systemd.xml
+++ b/chapter08/systemd.xml
@@ -192,7 +192,9 @@ meson setup \
 
     <!-- Please make sure systemd man pages tarball has a common leading
          component in the path.  -->
-<screen><userinput remap="install">tar -xf ../../systemd-man-pages-&systemd-man-version;.tar.xz --strip-components=1 -C /usr/share/man</userinput></screen>
+<screen><userinput remap="install">tar -xf ../../systemd-man-pages-&systemd-version;.tar.xz \
+    --no-same-owner --strip-components=1   \
+    -C /usr/share/man</userinput></screen>
 
     <para>Create the <filename>/etc/machine-id</filename> file needed by
     <command>systemd-journald</command>:</para>

From bec5f879a3940faf011c853b66f37c242fe85302 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Sat, 29 Jul 2023 09:59:44 +0800
Subject: [PATCH 3/4] changelog: Prefix new "systemd" entry with "udev from"
 for sysv

---
 chapter01/changelog.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index d5debd345..ac551a947 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -57,7 +57,8 @@
           <ulink url='&lfs-ticket-root;5287'>#5287</ulink>.</para>
         </listitem>
         <listitem>
-          <para>[bdubbs] - Update to systemd-254. Fixes
+          <para>[bdubbs] - Update to<phrase revision='sysv'> udev
+          from</phrase> systemd-254. Fixes
           <ulink url='&lfs-ticket-root;5293'>#5293</ulink>.</para>
         </listitem>
         <listitem>

From c2ccad14a5ed01857b84199133d7468ccd02c461 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Sat, 29 Jul 2023 10:19:04 +0800
Subject: [PATCH 4/4] systemd: Add two new symlinks into contents

---
 chapter08/systemd.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/chapter08/systemd.xml b/chapter08/systemd.xml
index eb8ea77b0..63003ac68 100644
--- a/chapter08/systemd.xml
+++ b/chapter08/systemd.xml
@@ -233,12 +233,14 @@ meson setup \
       <seglistitem>
         <seg>busctl, coredumpctl, halt (symlink to systemctl),
         hostnamectl, init, journalctl, kernel-install, localectl, loginctl,
-        machinectl, networkctl, oomctl, portablectl, poweroff (symlink to
+        machinectl, mount.ddi (symlink to systemd-dissect), networkctl,
+        oomctl, portablectl, poweroff (symlink to
         systemctl), reboot (symlink to systemctl), resolvconf (symlink to
         resolvectl), resolvectl, runlevel (symlink to systemctl), shutdown
         (symlink to systemctl), systemctl, systemd-ac-power, systemd-analyze,
         systemd-ask-password, systemd-cat, systemd-cgls, systemd-cgtop,
-        systemd-creds, systemd-delta, systemd-detect-virt,
+        systemd-confext (symlink to systemd-sysext), systemd-creds,
+        systemd-delta, systemd-detect-virt,
         systemd-dissect, systemd-escape, systemd-hwdb, systemd-id128,
         systemd-inhibit, systemd-machine-id-setup,
         systemd-mount, systemd-notify, systemd-nspawn, systemd-path,