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

chapter01/changelog.xml

@@ -52,6 +52,12 @@
 </itemizedlist>
 </para></listitem>
 
+<listitem><para>September 2nd, 2002 [timothy]: Chapter 06 - Bash: Removed
+creation of sh symlink. Creating the bash and sh symlinks: Added /bin/bash
+symlink, symlinked sh to bash. Gzip, Sysvinit, Util-Linux: Shortened cp
+command. Makedev: Removed /bin/bash creation and removal. Man: Modified sed
+statement to edit less call, so SGR will work.</para></listitem>
+
 <listitem><para>September 1st, 2002 [timothy]: Chapter 06 - About
 debugging symbols: Removed info. about stripping /static. Man: Added sed
 statement to prevent groff from using SGR escape sequences.</para></listitem>

chapter05/gcc-inst.xml

@@ -19,7 +19,7 @@ mkdir ../gcc-build &&
 cd ../gcc-build &&
 ../gcc-&gcc-version;/configure --prefix=/static --enable-languages=c \
    --disable-nls --disable-shared --enable-threads=posix &&
-echo "#define HAVE_GAS_HIDDEN 1" >> gcc/auto-host.h &&
+echo "#define HAVE_GAS_HIDDEN 1" >> gcc/auto-host.h &&
 make BOOT_LDFLAGS=-static bootstrap &&
 make prefix=$LFS/static install &&
 ln -s gcc $LFS/static/bin/cc</userinput></screen></para>

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>

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
+<para>Some programs hard-wire paths to programs which don't exist yet. In
-which may cause us trouble is <filename>/bin/sh</filename>.
+order to satisfy these programs, we create the <filename>/bin/bash</filename>
-We therefore create this for the time being and replace it 
+and <filename>/bin/sh</filename> symlinks.</para>
-properly when the bash package is (re)installed.</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>
 

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;

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 
+<para>Note: the MAKEDEV-&makedev-version;.bz2 file you have unpacked is not
-won't create a directory for you to cd into.</para>
+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;
+<para><screen><userinput>cp MAKEDEV-&makedev-version; /dev/MAKEDEV &amp;&amp;
-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;
+<para><screen><userinput>./MAKEDEV -v generic</userinput></screen></para>
-rm /bin/bash</userinput></screen></para>
 
 <para>If you do intend to use devpts, then run:</para>
-<para><screen><userinput>./MAKEDEV -v generic-nopty &amp;&amp;
+<para><screen><userinput>./MAKEDEV -v generic-nopty</userinput></screen></para>
-rm /bin/bash</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

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>:
+<para><userinput>sed '/^PAGER/s/-is/-isR/'</userinput>:
-This prevents groff from using SGR (Set Graphics Rendition) escape
+The version of groff we installed supports SGR (Set Graphics Rendition)
-sequences on our man pages.</para>
+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>
 

chapter06/man-inst.xml

@@ -7,10 +7,14 @@
     ./configure -default -confdir=/etc &&
 make &&
 cp src/man.conf{,.backup} &&
-sed -e '/^NROFF/s/-mandoc/-c -mandoc/' \
+sed '/^PAGER/s/-is/-isR/' \
-    src/man.conf.backup > src/man.conf &&
+    src/man.conf.backup > src/man.conf &&
 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>

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>
 

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>

index.xml

@@ -4,8 +4,8 @@
 
 <!ENTITY book SYSTEM "book/book.xml">
 
-<!ENTITY version "20020901">
+<!ENTITY version "20020902">
-<!ENTITY releasedate "September 1st, 2002">
+<!ENTITY releasedate "September 2nd, 2002">
 
 <!ENTITY ftp-root "ftp://ftp.linuxfromscratch.org">
 <!ENTITY http-root "http://ftp.linuxfromscratch.org">