Symlink sh to bash, and bash to /static/bin/bash. Shortened some cp commands. Changed call to less so SGR will work.

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

8 files changed, 26 insertions, 24 deletions

diff --git a/chapter06/bash-inst.xml b/chapter06/bash-inst.xml
index ea821923e..88f6aa874 100644
--- a/chapter06/bash-inst.xml
+++ b/chapter06/bash-inst.xml
@@ -6,7 +6,6 @@
 <para><screen><userinput>./configure --prefix=/usr --bindir=/bin &amp;&amp;
 make &amp;&amp;
 make install &amp;&amp;
-ln -sf bash /bin/sh &amp;&amp;
 exec /bin/bash --login</userinput></screen></para>
 
 </sect2>
diff --git a/chapter06/createfiles.xml b/chapter06/createfiles.xml
index 8c4b76b2d..d71a19491 100644
--- a/chapter06/createfiles.xml
+++ b/chapter06/createfiles.xml
@@ -1,15 +1,16 @@
 <sect1 id="ch06-createfiles">
-<title>Creating the /bin/sh symlink</title>
+<title>Creating the bash and sh symlinks</title>
 <?dbhtml filename="createfiles.html" dir="chapter06"?>
 
-<para>Some programs hard-wire paths that don't exist yet.  The only one
-which may cause us trouble is <filename>/bin/sh</filename>.
-We therefore create this for the time being and replace it 
-properly when the bash package is (re)installed.</para>
+<para>Some programs hard-wire paths to programs which don't exist yet. In
+order to satisfy these programs, we create the <filename>/bin/bash</filename>
+and <filename>/bin/sh</filename> symlinks.</para>
 
-<para>Create the /bin/sh symlink by running the following commands:</para>
+<para>Create the /bin/bash and /bin/sh symlinks by running the following
+commands:</para>
 
-<para><screen><userinput>ln -s /static/bin/bash /bin/sh</userinput></screen></para>
+<para><screen><userinput>ln -s /static/bin/bash /bin/bash &amp;&amp;
+ln -s bash /bin/sh</userinput></screen></para>
 
 </sect1>
 
diff --git a/chapter06/gzip-inst.xml b/chapter06/gzip-inst.xml
index 30581ad63..c4048e571 100644
--- a/chapter06/gzip-inst.xml
+++ b/chapter06/gzip-inst.xml
@@ -4,7 +4,7 @@
 <para>Install Gzip by running the following commands:</para>
 
 <para><screen><userinput>./configure --prefix=/usr &amp;&amp;
-cp gzexe.in gzexe.in.backup &amp;&amp;
+cp gzexe.in{,.backup} &amp;&amp;
 sed 's%"BINDIR"%/bin%' gzexe.in.backup &gt; gzexe.in &amp;&amp;
 make &amp;&amp;
 make install &amp;&amp;
diff --git a/chapter06/makedev-inst.xml b/chapter06/makedev-inst.xml
index 6fa63a064..a5d093dc5 100644
--- a/chapter06/makedev-inst.xml
+++ b/chapter06/makedev-inst.xml
@@ -1,13 +1,12 @@
 <sect2>
 <title>Creating devices</title>
 
-<para>Note: the MAKEDEV-&makedev-version;.bz2 file you have unpacked is not an archive, so it 
-won't create a directory for you to cd into.</para>
+<para>Note: the MAKEDEV-&makedev-version;.bz2 file you have unpacked is not
+an archive, so it won't create a directory for you to cd into.</para>
 
 <para>Create the device files by running the following commands:</para>
 
-<para><screen><userinput>ln -s /static/bin/bash /bin/bash &amp;&amp;
-cp MAKEDEV-&makedev-version; /dev/MAKEDEV &amp;&amp;
+<para><screen><userinput>cp MAKEDEV-&makedev-version; /dev/MAKEDEV &amp;&amp;
 cd /dev &amp;&amp;
 chmod 754 MAKEDEV</userinput></screen></para>
 
@@ -15,12 +14,10 @@ chmod 754 MAKEDEV</userinput></screen></para>
 can run one of two commands:</para>
 
 <para>If you do not intend to use devpts, run:</para>
-<para><screen><userinput>./MAKEDEV -v generic &amp;&amp;
-rm /bin/bash</userinput></screen></para>
+<para><screen><userinput>./MAKEDEV -v generic</userinput></screen></para>
 
 <para>If you do intend to use devpts, then run:</para>
-<para><screen><userinput>./MAKEDEV -v generic-nopty &amp;&amp;
-rm /bin/bash</userinput></screen></para>
+<para><screen><userinput>./MAKEDEV -v generic-nopty</userinput></screen></para>
 
 <para>Note that if you aren't sure, it's best to use 
 the <userinput>./MAKEDEV -v generic</userinput> command as this will
diff --git a/chapter06/man-exp.xml b/chapter06/man-exp.xml
index 00c41e2ae..fc09310b2 100644
--- a/chapter06/man-exp.xml
+++ b/chapter06/man-exp.xml
@@ -8,9 +8,10 @@ where a program is found. By appending /usr/bin:/bin to PATH for the
 ./configure command, we make sure that man doesn't use the /static versions
 of our programs.</para>
 
-<para><userinput>sed -e '/^NROFF/s/-mandoc/-c -mandoc/'</userinput>:
-This prevents groff from using SGR (Set Graphics Rendition) escape
-sequences on our man pages.</para>
+<para><userinput>sed '/^PAGER/s/-is/-isR/'</userinput>:
+The version of groff we installed supports SGR (Set Graphics Rendition)
+escape sequences. In order for our man pages to display properly, we
+add the R argument to the call for the less pager.</para>
 
 </sect2>
 
diff --git a/chapter06/man-inst.xml b/chapter06/man-inst.xml
index 38fdcd8e4..0c72b3787 100644
--- a/chapter06/man-inst.xml
+++ b/chapter06/man-inst.xml
@@ -7,10 +7,14 @@
 &nbsp;&nbsp;&nbsp;&nbsp;./configure -default -confdir=/etc &amp;&amp;
 make &amp;&amp;
 cp src/man.conf{,.backup} &amp;&amp;
-sed -e '/^NROFF/s/-mandoc/-c -mandoc/' \
-&nbsp;&nbsp;&nbsp;&nbsp;src/man.conf.backup > src/man.conf &amp;&amp;
+sed '/^PAGER/s/-is/-isR/' \
+&nbsp;&nbsp;&nbsp;&nbsp;src/man.conf.backup &gt; src/man.conf &amp;&amp;
 make install</userinput></screen></para>
 
+<para>Note: If you wish to disable SGR escape sequences, you should
+edit the man.conf file and add the <userinput>-c</userinput> argument
+to nroff.</para>
+
 <para>You may want to take a look at the man hint 
 at <ulink url="&hints-root;man.txt"/> which deals with formatting 
 and compression issues for man pages.</para>
diff --git a/chapter06/sysvinit-inst.xml b/chapter06/sysvinit-inst.xml
index 65d15bd35..a6c846260 100644
--- a/chapter06/sysvinit-inst.xml
+++ b/chapter06/sysvinit-inst.xml
@@ -10,7 +10,7 @@ that the sentence reads "Sending processes started by init the TERM signal",
 by running the following commands. If you don't want to change it,
 skip it.</para>
 
-<para><screen><userinput>cp src/init.c src/init.c.backup &amp;&amp;
+<para><screen><userinput>cp src/init.c{,.backup} &amp;&amp;
 sed 's/Sending processes/Sending processes started by init/g' \
 &nbsp;&nbsp;&nbsp;&nbsp;src/init.c.backup &gt; src/init.c</userinput></screen></para>
 
diff --git a/chapter06/utillinux-inst.xml b/chapter06/utillinux-inst.xml
index b3b114ffd..1f6ee9f9c 100644
--- a/chapter06/utillinux-inst.xml
+++ b/chapter06/utillinux-inst.xml
@@ -5,7 +5,7 @@
 adjtime file, instead of the usual /etc. To make hwclock, which is part of the
 util-linux package, FHS-compliant, run the following.</para>
 
-<para><screen><userinput>cp hwclock/hwclock.c hwclock/hwclock.c.backup &amp;&amp;
+<para><screen><userinput>cp hwclock/hwclock.c{,.backup} &amp;&amp;
 sed 's%etc/adjtime%var/lib/hwclock/adjtime%' \
 &nbsp;&nbsp;&nbsp;&nbsp;hwclock/hwclock.c.backup &gt; hwclock/hwclock.c &amp;&amp;
 mkdir -p /var/lib/hwclock</userinput></screen></para>