From ac55dee003da1b562812df6af4b1d9f5bb4f7939 Mon Sep 17 00:00:00 2001
From: Zack Winkles <winkie@linuxfromscratch.org>
Date: Wed, 12 May 2004 19:58:19 +0000
Subject: Fixed bug #307

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@3562 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter06/coreutils.xml | 24 +++++-------------------
 1 file changed, 5 insertions(+), 19 deletions(-)

(limited to 'chapter06')

diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml
index 0a98f0ff2..c65ca6a34 100644
--- a/chapter06/coreutils.xml
+++ b/chapter06/coreutils.xml
@@ -30,11 +30,10 @@ architectures:</para>
 
 <screen><userinput>patch -Np1 -i ../coreutils-&coreutils-version;-uname-2.patch</userinput></screen>
 
-<para>We do not want Coreutils to install its version of the
-<command>hostname</command> program, because it is inferior to the version
-provided by Net-tools. Prevent its installation by applying a patch:</para>
+<para>Prevent Coreutils from installing binaries that will be later be installed
+by other programs:</para>
 
-<screen><userinput>patch -Np1 -i ../coreutils-&coreutils-version;-hostname-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../coreutils-&coreutils-version;-dupes-1.patch</userinput></screen>
 
 <para>Now prepare Coreutils for compilation:</para>
 
@@ -50,13 +49,6 @@ therefore have to set up a few things before being able to run the tests. If
 you choose not to run these tests, skip down to <quote>Install the
 package</quote>.</para>
 
-<para>To be able to run the full test suite, the <command>su</command> program
-needs to be installed. We didn't bother to install this little program in
-<xref linkend="chapter-temporary-tools"/> because it requires root privileges,
-so do it now:</para>
-
-<screen><userinput>make install-root</userinput></screen>
-
 <para>Create two dummy groups and a dummy user name:</para>
 
 <screen><userinput>echo "dummy1:x:1000" &gt;&gt; /etc/group
@@ -71,7 +63,7 @@ are meant to be run as <emphasis>root</emphasis>:</para>
 <para>Then run the remainder of the tests as the <emphasis>dummy</emphasis>
 user:</para>
 
-<screen><userinput>su dummy -c "make RUN_EXPENSIVE_TESTS=yes check"</userinput></screen>
+<screen><userinput>src/su dummy -c "make RUN_EXPENSIVE_TESTS=yes check"</userinput></screen>
 
 <para>When you're done testing, remove the dummy user and groups:</para>
 
@@ -86,15 +78,9 @@ user:</para>
 <screen><userinput>mv /usr/bin/{[,basename,cat,chgrp,chmod,chown,cp,dd,df} /bin
 mv /usr/bin/{date,echo,false,head,install,ln,ls} /bin
 mv /usr/bin/{mkdir,mknod,mv,pwd,rm,rmdir,sync} /bin
-mv /usr/bin/{sleep,stty,su,test,touch,true,uname} /bin
+mv /usr/bin/{sleep,stty,test,touch,true,uname} /bin
 mv /usr/bin/chroot /usr/sbin</userinput></screen>
 
-<para>We'll be using the <filename>kill</filename> program from the Procps
-package (installed as <filename>/bin/kill</filename> later in the chapter).
-Remove the one installed by Coreutils:</para>
-
-<screen><userinput>rm /usr/bin/kill</userinput></screen>
-
 <para>Finally, create a symlink to be FHS-compliant:</para>
 
 <screen><userinput>ln -s ../../bin/install /usr/bin</userinput></screen>
-- 
cgit v1.2.3-54-g00ecf