Changeset d3e7e98 for chapter08/systemd.xml

Timestamp:

05/30/2022 03:45:10 AM (2 years ago)

Author:

Thomas Trepl (Moody) <thomas@…>

Branches:

multilib

Children:

bdb4c90

Parents:

e8d4ea4 (diff), 5f3777a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Automatic merge of trunk into multilib

File:

• chapter08/systemd.xml (modified) (7 diffs)

chapter08/systemd.xml

@@ -41 +41 @@
     <title>Installation of systemd</title>
 
-    <para>First, apply a patch to fix a security vulnerability and regressions
-    with hostnames and idle units:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-upstream_fixes-1.patch</userinput></screen>
-
-    <para>Now, apply a patch to fix a problem with the linux kernel's headers in 
-    version 5.17 and later:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-kernel_5.17_fixes-1.patch</userinput></screen>
-
     <para>Remove two unneeded groups,
     <systemitem class="groupname">render</systemitem> and
@@ -65 +55 @@
 
 meson --prefix=/usr                 \
-      --sysconfdir=/etc             \
-      --localstatedir=/var          \
       --buildtype=release           \
-      -Dblkid=true                  \
       -Ddefault-dnssec=no           \
       -Dfirstboot=false             \
@@ -74 +61 @@
       -Dldconfig=false              \
       -Dsysusers=false              \
-      -Db_lto=false                 \
       -Drpmmacrosdir=no             \
       -Dhomed=false                 \
@@ -80 +66 @@
       -Dman=false                   \
       -Dmode=release                \
+      -Dpamconfdir=no               \
       -Ddocdir=/usr/share/doc/systemd-&systemd-version; \
       ..</userinput></screen>
@@ -174 +161 @@
       </varlistentry>
 
+      <varlistentry>
+        <term><parameter>-Dpamconfdir=no</parameter></term>
+        <listitem>
+          <para>Prevent the installation of a PAM configuration file not
+          functional on LFS.</para>
+        </listitem>
+      </varlistentry>
     </variablelist>
 
@@ -186 +180 @@
     <para>Install the man pages:</para>
 
-<screen><userinput remap="install">tar -xf ../../systemd-man-pages-&systemd-man-version;.tar.xz -C /usr/share/man</userinput></screen>
-
-    <para>Remove a useless directory:</para>
-
-<screen><userinput remap="install">rm -rf /usr/lib/pam.d</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 -C /usr/share/man</userinput></screen>
 
     <para>Create the <filename>/etc/machine-id</filename> file needed by
@@ -200 +192 @@
 
 <screen><userinput remap="adjust">systemctl preset-all</userinput></screen>
+
+    <para>Disable a service for upgrading binary distros.  It's useless for
+    a basic Linux system built from source, and it will report an error if
+    it's enabled but not configured:</para>
+
+<screen><userinput remap="adjust">systemctl disable systemd-sysupdate</userinput></screen>
 
 <!-- dev: 50-pid-max.conf is not removed in BLFS, so I commented the following out.