diff options
author | Thomas Trepl <thomas@linuxfromscratch.org> | 2023-08-03 12:28:30 +0200 |
---|---|---|
committer | Thomas Trepl <thomas@linuxfromscratch.org> | 2023-08-03 12:28:30 +0200 |
commit | 9a963c528574d11541cce7c3f3cd680b261483a7 (patch) | |
tree | cb071ac1879558bc5a70572532b10ceda4c1ad15 | |
parent | 2ce66c4197c41ce73f095a36892e420f0c13f3c2 (diff) | |
parent | 308ec7a37ffbf0d8fb43dcd897c44df69daa5ca3 (diff) |
Merge branch 'trunk' of git.linuxfromscratch.org:lfs into trunk
-rw-r--r-- | chapter08/dbus.xml | 13 | ||||
-rw-r--r-- | chapter08/udev.xml | 7 |
2 files changed, 17 insertions, 3 deletions
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> 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 |