From 264a80d60fe1938d94718c6e3f353c5e4e27e1cb Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Thu, 3 Aug 2023 10:10:11 +0800
Subject: [PATCH 1/2] udev: Use --no-same-owner for man pages, like systemd

By the way, fix a minor formatting issue in udev-hwdb.8.
---
 chapter08/udev.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/chapter08/udev.xml b/chapter08/udev.xml
index 67e835afc..35bb12f46 100644
--- a/chapter08/udev.xml
+++ b/chapter08/udev.xml
@@ -147,11 +147,12 @@ make -f &udev-lfs-version;/Makefile.lfs install</userinput></screen>
 
     <!-- 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       \
+<screen><userinput remap="install">tar -xf ../../systemd-man-pages-&systemd-man-version;.tar.xz                            \
+    --no-same-owner --strip-components=1                              \
     -C /usr/share/man --wildcards '*/udev*' '*/libudev*'              \
                                   '*/systemd-'{hwdb,udevd.service}.8
-sed 's/systemd\(\\\?-\)/udev-/' /usr/share/man/man8/systemd-hwdb.8    \
-                              > /usr/share/man/man8/udev-hwdb.8
+sed 's/systemd\(\\\?-\)/udev\1/' /usr/share/man/man8/systemd-hwdb.8   \
+                               > /usr/share/man/man8/udev-hwdb.8
 sed 's|lib.*udevd|sbin/udevd|'                                        \
     /usr/share/man/man8/systemd-udevd.service.8                       \
   > /usr/share/man/man8/udevd.8

From 308ec7a37ffbf0d8fb43dcd897c44df69daa5ca3 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Thu, 3 Aug 2023 15:07:06 +0800
Subject: [PATCH 2/2] dbus: Add --enable-user-session like BLFS

This will install dbus.service and dbus.socket into
/usr/lib/systemd/user.  In a base LFS installation the systemd per-user
daemon is not usable at all, so they may seem useless.  But if we
install them, we can start to use them once systemd is rebuilt with PAM
in BLFS (without rebuilding dbus).
---
 chapter08/dbus.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/chapter08/dbus.xml b/chapter08/dbus.xml
index f59dd122b..62200fc27 100644
--- a/chapter08/dbus.xml
+++ b/chapter08/dbus.xml
@@ -52,6 +52,7 @@
             --sysconfdir=/etc                    \
             --localstatedir=/var                 \
             --runstatedir=/run                   \
+            --enable-user-session                \
             --disable-static                     \
             --disable-doxygen-docs               \
             --disable-xml-docs                   \
@@ -73,6 +74,18 @@
         </listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term>
+          <parameter>--enable-user-session</parameter>
+        </term>
+        <listitem>
+          <para>These ensures the D-Bus per-user service and socket unit
+          files are installed for Systemd.  They are not useful (but
+          harmless) in a base LFS installation, however they can be used
+          once systemd is rebuilt with PAM support in BLFS.</para>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
     <para>Compile the package:</para>