From 024bcced80005cfb60c9be4aed75543ade53af1e Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Fri, 2 Feb 2024 00:28:27 +0800
Subject: [PATCH] glibc: Need to remove /usr/sbin/nscd if upgrading on LFS <
 12.1

---
 chapter08/glibc.xml | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/chapter08/glibc.xml b/chapter08/glibc.xml
index e8984497b..791f9afd5 100644
--- a/chapter08/glibc.xml
+++ b/chapter08/glibc.xml
@@ -241,15 +241,24 @@ esac</userinput></screen>
           </para>
         </listitem>
 
-        <!-- Otherwise messages complaining "nscd disabled building Glibc"
-             will show up running things like sudo.  -->
-        <listitem revision='systemd'>
+        <!-- Otherwise on lfs-systemd nscd will fail to start on boot,
+             and on both lfs-sysv and lfs-systemd useradd etc. will try
+             to start nscd, then nscd will fail to start as well and
+             produce some spurious error message.  -->
+        <listitem>
           <para>
-            If upgrading on a LFS system based on Systemd prior to 12.1
-            (exclusive), disable and stop <command>nscd</command>:
+            If upgrading on a LFS system prior to 12.1 (exclusive),
+            remove the <command>nscd</command> program:
           </para>
 
-          <screen role='nodump'><userinput>systemctl disable --now nscd</userinput></screen>
+          <screen role='nodump'><userinput>rm -f /usr/sbin/nscd</userinput></screen>
+
+          <para>
+            If such a LFS system is based on Systemd, disable and stop
+            the <command>nscd</command> service now:
+          </para>
+
+          <screen revision='systemd' role='nodump'><userinput>systemctl disable --now nscd</userinput></screen>
         </listitem>
 
         <listitem>