Moved additional programs to the ($LFS)/bin directory that are used by the

bootscripts


git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@1553 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

7 files changed, 19 insertions, 10 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index b2e91aec3..d22180a65 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -24,6 +24,13 @@
 
 <itemizedlist>
 
+<listitem><para>February 10th, 2002 [gerard]: Chapter 5 + 6: Moved
+additional programs to the ($LFS)/bin directory that are used by the
+bootscripts. No programs used by bootscripts (except daemons themselves)
+should be in the /usr directory in case /usr isn't available until far
+along in the boot process (when it's an NFS share for
+example).</para></listitem>
+
 <listitem><para>February 6th, 2002 [markh]: Appendix A - All
 descriptions now synced and updated.</para></listitem>
 
diff --git a/chapter05/grep-inst.xml b/chapter05/grep-inst.xml
index 22102fd1d..92dc5208e 100644
--- a/chapter05/grep-inst.xml
+++ b/chapter05/grep-inst.xml
@@ -8,7 +8,7 @@ can also be used for other glibc versions so if you aren't sure, then
 use the first version.</para>
 
 <para><screen><userinput>export CPPFLAGS=-Dre_max_failures=re_max_failures2 &amp;&amp;
-./configure --prefix=$LFS/usr --disable-nls &amp;&amp;
+./configure --prefix=$LFS/usr --disable-nls --bindir=$LFS/bin &amp;&amp;
 unset CPPFLAGS &amp;&amp;
 make LDFLAGS=-static &amp;&amp;
 make install</userinput></screen></para>
@@ -16,7 +16,8 @@ make install</userinput></screen></para>
 <para>If you are using a newer glibc version (2.2.x), you can use the
 following commands to install Grep:</para>
  
-<para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls &amp;&amp;
+<para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls \
+&nbsp;&nbsp;&nbsp;--bindir=$LFS/bin &amp;&amp;
 make LDFLAGS=-static &amp;&amp;
 make install</userinput></screen></para>
 
diff --git a/chapter05/shellutils-inst.xml b/chapter05/shellutils-inst.xml
index 03619e480..d449d03d2 100644
--- a/chapter05/shellutils-inst.xml
+++ b/chapter05/shellutils-inst.xml
@@ -18,8 +18,8 @@ best to apply it.</para>
 make LDFLAGS=-static &amp;&amp;
 make install &amp;&amp;
 cd $LFS/usr/bin &amp;&amp;
-mv date echo false pwd stty $LFS/bin &amp;&amp;
-mv true uname hostname $LFS/bin</userinput></screen></para>
+mv basename date echo false hostname $LFS/bin &amp;&amp;
+mv pwd sleep stty su test true uname $LFS/bin &amp;&amp;</userinput></screen></para>
 
 </sect2>
 
diff --git a/chapter05/textutils-inst.xml b/chapter05/textutils-inst.xml
index d9ad8c448..08c544b75 100644
--- a/chapter05/textutils-inst.xml
+++ b/chapter05/textutils-inst.xml
@@ -6,7 +6,7 @@
 <para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls &amp;&amp;
 make LDFLAGS=-static &amp;&amp;
 make install &amp;&amp;
-mv $LFS/usr/bin/cat $LFS/bin</userinput></screen></para>
+mv $LFS/usr/bin/cat $LFS/usr/bin/head $LFS/bin</userinput></screen></para>
 
 </sect2>
 
diff --git a/chapter06/grep-inst.xml b/chapter06/grep-inst.xml
index 7620afcd5..17885b7f5 100644
--- a/chapter06/grep-inst.xml
+++ b/chapter06/grep-inst.xml
@@ -3,7 +3,7 @@
 
 <para>Install Grep by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+<para><screen><userinput>./configure --prefix=/usr --bindir=/bin &amp;&amp;
 make &amp;&amp;
 make install</userinput></screen></para>
 
diff --git a/chapter06/shellutils-inst.xml b/chapter06/shellutils-inst.xml
index cd1f44b26..3003c052d 100644
--- a/chapter06/shellutils-inst.xml
+++ b/chapter06/shellutils-inst.xml
@@ -7,8 +7,8 @@
 make &amp;&amp;
 make install &amp;&amp;
 cd /usr/bin &amp;&amp;
-mv date echo false pwd stty /bin &amp;&amp;
-mv su true uname hostname /bin &amp;&amp;
+mv basename date echo false hostname /bin &amp;&amp;
+mv pwd sleep stty su test true uname /bin &amp;&amp;
 mv chroot ../sbin</userinput></screen></para>
 
 </sect2>
@@ -23,7 +23,8 @@ are built into the bash interpreter, but the FHS dictates that there should be a
 <filename>[</filename> binary. We create that in this way, while still in the
 <filename>/usr/bin</filename> directory:</para>
 
-<para><screen><userinput>ln -sf test [</userinput></screen></para>
+<para><screen><userinput>cd /bin &amp;&amp;
+ln -sf test [</userinput></screen></para>
 
 </sect2>
 
diff --git a/chapter06/textutils-inst.xml b/chapter06/textutils-inst.xml
index 43088ac18..2b62f220a 100644
--- a/chapter06/textutils-inst.xml
+++ b/chapter06/textutils-inst.xml
@@ -6,7 +6,7 @@
 <para><screen><userinput>./configure --prefix=/usr &amp;&amp;
 make &amp;&amp;
 make install &amp;&amp;
-mv /usr/bin/cat /bin</userinput></screen></para>
+mv /usr/bin/cat /usr/bin/head /bin</userinput></screen></para>
 
 </sect2>