From 6e8c493d265fa91dba8c7e94dbfacbb48d12331b Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@mengyan1223.wang>
Date: Fri, 5 Feb 2021 07:22:20 +0000
Subject: ch08/dbus: sync with BLFS

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@12129 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter08/dbus.xml | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

(limited to 'chapter08')

diff --git a/chapter08/dbus.xml b/chapter08/dbus.xml
index 211399207..5f51900cc 100644
--- a/chapter08/dbus.xml
+++ b/chapter08/dbus.xml
@@ -48,14 +48,16 @@
 
     <para>Prepare D-Bus for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr                       \
-            --sysconfdir=/etc                   \
-            --localstatedir=/var                \
-            --disable-static                    \
-            --disable-doxygen-docs              \
-            --disable-xml-docs                  \
+<screen><userinput remap="configure">./configure --prefix=/usr                        \
+            --sysconfdir=/etc                    \
+            --localstatedir=/var                 \
+            --disable-static                     \
+            --disable-doxygen-docs               \
+            --disable-xml-docs                   \
             --docdir=/usr/share/doc/dbus-&dbus-version; \
-            --with-console-auth-dir=/run/console</userinput></screen>
+            --with-console-auth-dir=/run/console \
+            --with-system-pid-file=/run/dbus/pid \
+            --with-system-socket=/run/dbus/system_bus_socket</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>
@@ -68,6 +70,18 @@
         </listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term>
+          <parameter>--with-system-pid-file=/run/dbus/pid</parameter> and
+          <parameter>--with-system-socket=/run/dbus/system_bus_socket</parameter>
+        </term>
+        <listitem>
+          <para>These set the location of the PID file and the system bus socket
+          to be in <filename class="directory">/run</filename>, instead of
+          deprecated <filename class="directory">/var/run</filename>.</para>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
     <para>Compile the package:</para>
@@ -96,11 +110,6 @@ ln -sfv ../../lib/$(readlink /usr/lib/libdbus-1.so) /usr/lib/libdbus-1.so</useri
 
 <screen><userinput remap="install">ln -sfv /etc/machine-id /var/lib/dbus</userinput></screen>
 
-    <para>Move the socket file to /run instead of the deprecated
-    /var/run:</para>
-
- <screen><userinput remap="install">sed -i 's:/var/run:/run:' /lib/systemd/system/dbus.socket</userinput></screen>
-
   </sect2>
 
   <sect2 id="contents-dbus" role="content">
-- 
cgit v1.2.3-54-g00ecf