diff options
| author | Bruce Dubbs <bdubbs@linuxfromscratch.org> | 2015-10-25 21:38:38 +0000 |
|---|---|---|
| committer | Bruce Dubbs <bdubbs@linuxfromscratch.org> | 2015-10-25 21:38:38 +0000 |
| commit | 7c4d11a23a9c3614bd5b6a6051119a7b24b9ff6a (patch) | |
| tree | b550a116fb7514b939a5343001f721ebb841886c | |
| parent | 82f4f90a36e24e61661e1c266dc1efba6546d009 (diff) | |
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
| -rw-r--r-- | bootscripts/lfs/sysconfig/rc.site | 4 | ||||
| -rw-r--r-- | chapter01/changelog.xml | 10 | ||||
| -rw-r--r-- | chapter02/mounting.xml | 2 | ||||
| -rw-r--r-- | general.ent | 4 | ||||
| -rw-r--r-- | prologue/hostreqs.xml | 6 |
5 files changed, 20 insertions, 6 deletions
diff --git a/bootscripts/lfs/sysconfig/rc.site b/bootscripts/lfs/sysconfig/rc.site index 9b501e542..400870403 100644 --- a/bootscripts/lfs/sysconfig/rc.site +++ b/bootscripts/lfs/sysconfig/rc.site @@ -71,8 +71,8 @@ #UTC=1 #CLOCKPARAMS= -# For consolelog -#LOGLEVEL=5 +# For consolelog (Note that the default, 7=debug, is noisy) +#LOGLEVEL=7 # For network #HOSTNAME=mylfs diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 4a253bc1b..8549fe37b 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -37,6 +37,16 @@ --> <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> <para>2015-10-17</para> <itemizedlist> <listitem> diff --git a/chapter02/mounting.xml b/chapter02/mounting.xml index e1db1fe63..c6f749e66 100644 --- a/chapter02/mounting.xml +++ b/chapter02/mounting.xml @@ -14,7 +14,7 @@ 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 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>Create the mount point and mount the LFS file system by running:</para> diff --git a/general.ent b/general.ent index da6e6e333..4678d917a 100644 --- a/general.ent +++ b/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 but not -rc releases --> -<!ENTITY releasedate "October 17, 2015"> +<!ENTITY releasedate "October 25, 2015"> <!ENTITY copyrightdate "1999-2015"><!-- jhalfs needs a literal dash, not – --> <!ENTITY milestone "7.9"> <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" --> diff --git a/prologue/hostreqs.xml b/prologue/hostreqs.xml index f77d88105..2720db439 100644 --- a/prologue/hostreqs.xml +++ b/prologue/hostreqs.xml @@ -163,7 +163,11 @@ # Simple script to list version numbers of critical development tools export LC_ALL=C bash --version | head -n1 | cut -d" " -f2-4 -echo "/bin/sh -> `readlink -f /bin/sh`" +MYSH=$(readlink -f /bin/sh) +echo "/bin/sh -> $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- bison --version | head -n1 |