From 0c418fcb89f74d6960cdb58a81801671ed4acb7b Mon Sep 17 00:00:00 2001
From: Gerard Beekmans <gerard@linuxfromscratch.org>
Date: Tue, 13 May 2003 07:23:32 +0000
Subject: Applied Zack's shadow patch

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2604 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml      |  8 ++++++--
 chapter06/shadowpwd-inst.xml | 10 ++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index e970c16ce..186d313ec 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -74,11 +74,15 @@
 </itemizedlist>
 </para></listitem>
 
-<listitem><para>May 12th, 2003 [winkie]: Chapter 06 - Installing Procps:
+<listitem><para>May 13th, 2003 [winkie]: Chapter 06 - Installing Shadow:
+touch the /usr/bin/passwd file before installation. Not doing so results in
+Shadow thinking passwd will be in /bin/passwd.</para></listitem>
+
+<listitem><para>May 13th, 2003 [winkie]: Chapter 06 - Installing Procps:
 Remove the /lib/libproc.so symlink. No package outside of Procps itself
 uses this library, and none should.</para></listitem>
 
-<listitem><para>May 12th, 2003 [winkie]: Chapter 06 - Installing Net-tools:
+<listitem><para>May 13th, 2003 [winkie]: Chapter 06 - Installing Net-tools:
 Run "make config" before doing make. Fixes bugs #462 and
 #497.</para></listitem>
 
diff --git a/chapter06/shadowpwd-inst.xml b/chapter06/shadowpwd-inst.xml
index 435ff8ddb..ba30a1a46 100644
--- a/chapter06/shadowpwd-inst.xml
+++ b/chapter06/shadowpwd-inst.xml
@@ -21,6 +21,16 @@ following commands:</para>
 <para><screen><userinput>touch /var/run/utmp /var/log/{btmp,lastlog,wtmp} &amp;&amp;
 chmod 644 /var/run/utmp /var/log/{btmp,lastlog,wtmp}</userinput></screen></para>
 
+<para>Shadow hard-codes the path to the passwd binary within itself, but
+it does it the wrong way. If no passwd binary is present before
+installing Shadow, it (wrongly) assumes that it will be at /bin/passwd,
+but then installs its own in /usr/bin/passwd. This will lead to strange
+errors about not finding /bin/passwd. To fix workaround this bug in
+Shadow, we'll create a dummy passwd file so that it gets hardcoded in
+the right place:</para>
+
+<para><screen><userinput>touch /usr/bin/passwd</userinput></screen></para>
+
 <para>Prepare Shadow to be compiled:</para>
 
 <para><screen><userinput>./configure --prefix=/usr --libdir=/usr/lib \
-- 
cgit v1.2.3-54-g00ecf