From cd99aff68379e235f8aefec774def19151832d67 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@mengyan1223.wang>
Date: Mon, 3 Jan 2022 23:28:24 +0800
Subject: [PATCH 1/2] Revert "shadow: remove explicit --disable-{su,runuser}"

This reverts commit 6ecd06927ba617a521dafc6c4feb1b60c6941769.

Continue to use shadow su, until it's really dead.
---
 chapter08/util-linux.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/chapter08/util-linux.xml b/chapter08/util-linux.xml
index 3b7a6c4d2..341310556 100644
--- a/chapter08/util-linux.xml
+++ b/chapter08/util-linux.xml
@@ -50,7 +50,9 @@
             --disable-chfn-chsh  \
             --disable-login      \
             --disable-nologin    \
+            --disable-su         \
             --disable-setpriv    \
+            --disable-runuser    \
             --disable-pylibmount \
             --disable-static     \
             --without-python     \
@@ -64,7 +66,9 @@
             --disable-chfn-chsh  \
             --disable-login      \
             --disable-nologin    \
+            --disable-su         \
             --disable-setpriv    \
+            --disable-runuser    \
             --disable-pylibmount \
             --disable-static     \
             --without-python     \

From d21ec2fcbb46ee07dc404a39b3bebba762a91a6b Mon Sep 17 00:00:00 2001
From: "Douglas R. Reno" <renodr@linuxfromscratch.org>
Date: Mon, 3 Jan 2022 12:03:45 -0600
Subject: [PATCH 2/2] systemd: Add CONFIG_PSI to the kernel configuration to
 get systemd-oomd to work.

Note that it just skips bringing systemd-oomd up when not present, and
does not fail the startup process.
---
 chapter01/changelog.xml | 10 ++++++++++
 chapter10/kernel.xml    |  2 ++
 2 files changed, 12 insertions(+)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index d33afe99e..ba7a7b587 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,16 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
     -->
+    <listitem revision="systemd">
+      <para>2021-01-03</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Add additional kernel configuration to allow for
+          'systemd-oomd' to function.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2022-01-01</para>
       <itemizedlist>
diff --git a/chapter10/kernel.xml b/chapter10/kernel.xml
index 5e2341e0e..213fcd6eb 100644
--- a/chapter10/kernel.xml
+++ b/chapter10/kernel.xml
@@ -122,6 +122,8 @@ Device Drivers  ---&gt;
    [ ] Enable deprecated sysfs features to support old userspace tools [CONFIG_SYSFS_DEPRECATED]
    [*] Configure standard kernel features (expert users) [CONFIG_EXPERT] ---&gt;
       [*] open by fhandle syscalls [CONFIG_FHANDLE]
+   CPU/Task time and stats accounting ---&gt;
+      [*] Pressure stall information tracking [CONFIG_PSI]
 Firmware Drivers  ---&gt;
    [*] Export DMI identification via sysfs to userspace [CONFIG_DMIID]
 General architecture-dependent options  ---&gt;