From 6ba7c0f4bc94c1cdfe25f4ee0cd87f5320aebcce Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Sun, 15 Apr 2012 21:12:27 +0000
Subject: Install su as 'su', not 'su-tools' in chapter 5.  Use chapter 6's
 'su' for Bash.  Fixes #3057.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9810 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 12 ++++++++++++
 chapter05/coreutils.xml |  8 +++-----
 chapter06/bash.xml      |  2 +-
 chapter06/coreutils.xml |  2 +-
 general.ent             |  4 ++--
 5 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 0c2cb9362..577b349dd 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,18 @@
     </listitem>
 
 -->
+    <listitem>
+      <para>2012-04-15</para>
+      <itemizedlist>
+         <listitem>
+           <para>[matthew] - Use su from chapter 6 Coreutils in the Bash
+           instructions, instead of the one from chapter 5.  Install su as su
+           rather than su-tools in chapter 5. Fixes
+           <ulink url="&lfs-ticket-root;3057">#3057</ulink>.</para>
+         </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2012-05-09</para>
       <itemizedlist>
diff --git a/chapter05/coreutils.xml b/chapter05/coreutils.xml
index c79894a9b..ef5a044b3 100644
--- a/chapter05/coreutils.xml
+++ b/chapter05/coreutils.xml
@@ -81,12 +81,10 @@
 
     <para>The above command refuses to install <filename>su</filename>
     because the program cannot be installed setuid root as a non-privileged
-    user. By manually installing it with a different name, we can use it for
-    running tests in the final system as a non-privileged user and we keep a
-    possibly useful <command>su</command> from our host first in our PATH.
-    Install it with:</para>
+    user. By manually installing it, we can use it for running tests in the
+    final system as a non-privileged user. Install it with:</para>
 
-<screen><userinput remap="install">cp -v src/su /tools/bin/su-tools</userinput></screen>
+<screen><userinput remap="install">cp -v src/su /tools/bin</userinput></screen>
 
   </sect2>
 
diff --git a/chapter06/bash.xml b/chapter06/bash.xml
index f6a5ca7a6..06db04163 100644
--- a/chapter06/bash.xml
+++ b/chapter06/bash.xml
@@ -89,7 +89,7 @@
     <para>Now, run the tests as the <systemitem
     class="username">nobody</systemitem> user:</para>
 
-<screen><userinput remap="test">su-tools nobody -s /bin/bash -c "make tests"</userinput></screen>
+<screen><userinput remap="test">su nobody -s /bin/bash -c "make tests"</userinput></screen>
 
     <para>Install the package:</para>
 
diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml
index e5513ee65..d197e10e6 100644
--- a/chapter06/coreutils.xml
+++ b/chapter06/coreutils.xml
@@ -105,7 +105,7 @@
 
     <para>Now run the tests:</para>
 
-<screen><userinput remap="test">su-tools nobody -s /bin/bash -c "make RUN_EXPENSIVE_TESTS=yes check"</userinput></screen>
+<screen><userinput remap="test">su nobody -s /bin/bash -c "make RUN_EXPENSIVE_TESTS=yes check"</userinput></screen>
 
     <para>Remove the temporary group:</para>
 
diff --git a/general.ent b/general.ent
index f666b5e5a..245a8995f 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20120409">
-<!ENTITY releasedate "Apr 09, 2012">
+<!ENTITY version "SVN-20120415">
+<!ENTITY releasedate "Apr 15, 2012">
 <!ENTITY copyrightdate "1999-2012"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "7.2">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
-- 
cgit v1.2.3-54-g00ecf