Эх сурвалжийг харах

Revise version-check.sh to flag bad /bin/sh symlinks

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10967 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Bruce Dubbs 9 жил өмнө
parent
commit
7c4d11a23a

+ 2 - 2
bootscripts/lfs/sysconfig/rc.site

@@ -71,8 +71,8 @@
 #UTC=1
 #UTC=1
 #CLOCKPARAMS=
 #CLOCKPARAMS=
 
 
-# For consolelog
-#LOGLEVEL=5
+# For consolelog (Note that the default, 7=debug, is noisy)
+#LOGLEVEL=7
 
 
 # For network
 # For network
 #HOSTNAME=mylfs
 #HOSTNAME=mylfs

+ 10 - 0
chapter01/changelog.xml

@@ -36,6 +36,16 @@
     </listitem>
     </listitem>
 -->
 -->
 
 
+    <listitem>
+      <para>2015-10-25</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Revise version-check.sh to flag
+          bad /bin/sh symlinks.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
     <listitem>
       <para>2015-10-17</para>
       <para>2015-10-17</para>
       <itemizedlist>
       <itemizedlist>

+ 1 - 1
chapter02/mounting.xml

@@ -14,7 +14,7 @@
   be made accessible. In order to do this, the partition needs to be
   be made accessible. In order to do this, the partition needs to be
   mounted at a chosen mount point. For the purposes of this book, it is
   mounted at a chosen mount point. For the purposes of this book, it is
   assumed that the file system is mounted under the directory specified by the
   assumed that the file system is mounted under the directory specified by the
-  <envar>LFS</envar> environment varibale as described in the previous section.
+  <envar>LFS</envar> environment variable as described in the previous section.
   </para>
   </para>
 
 
   <para>Create the mount point and mount the LFS file system by running:</para>
   <para>Create the mount point and mount the LFS file system by running:</para>

+ 2 - 2
general.ent

@@ -1,7 +1,7 @@
-<!ENTITY version         "SVN-20151017">
+<!ENTITY version         "SVN-20151025">
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book;. Change to x.y for release 
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book;. Change to x.y for release 
                                       but not -rc releases -->
                                       but not -rc releases -->
-<!ENTITY releasedate     "October 17, 2015">
+<!ENTITY releasedate     "October 25, 2015">
 <!ENTITY copyrightdate   "1999-2015"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY copyrightdate   "1999-2015"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "7.9">
 <!ENTITY milestone       "7.9">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->

+ 5 - 1
prologue/hostreqs.xml

@@ -163,7 +163,11 @@
 # Simple script to list version numbers of critical development tools
 # Simple script to list version numbers of critical development tools
 export LC_ALL=C
 export LC_ALL=C
 bash --version | head -n1 | cut -d" " -f2-4
 bash --version | head -n1 | cut -d" " -f2-4
-echo "/bin/sh -&gt; `readlink -f /bin/sh`"
+MYSH=$(readlink -f /bin/sh)
+echo "/bin/sh -&gt; $MYSH"
+echo $MYSH | grep -qv bash || echo "ERROR: /bin/sh does not point to bash"
+unset MYSH
+
 echo -n "Binutils: "; ld --version | head -n1 | cut -d" " -f3-
 echo -n "Binutils: "; ld --version | head -n1 | cut -d" " -f3-
 bison --version | head -n1
 bison --version | head -n1