Minor corrections to bootscripts

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

5 files changed, 22 insertions, 4 deletions

diff --git a/bootscripts/lfs/init.d/functions b/bootscripts/lfs/init.d/functions
index c9dbcef89..1487dfa39 100644
--- a/bootscripts/lfs/init.d/functions
+++ b/bootscripts/lfs/init.d/functions
@@ -123,6 +123,7 @@ boot_mesg()
    ${ECHO} ${ECHOPARM} -e "${2}${1}"
 
    # Log the message 
+   [ -d /run/var ] || return
    ${ECHO} ${ECHOPARM} -e "${2}${1}" >> /run/var/bootlog
 }
 
@@ -138,6 +139,7 @@ echo_ok()
    ${ECHO} -e "${NORMAL}"
    boot_mesg_flush
 
+   [ -d /run/var ] || return
    ${ECHO} -e "[ OK ]" >> /run/var/bootlog
 }
 
@@ -147,6 +149,7 @@ echo_failure()
    ${ECHO} -e "${NORMAL}"
     boot_mesg_flush
 
+   [ -d /run/var ] || return
    ${ECHO} -e "[ FAIL]"  >> /run/var/bootlog
 }
 
@@ -156,6 +159,7 @@ echo_warning()
    ${ECHO} -e "${NORMAL}"
    boot_mesg_flush
 
+   [ -d /run/var ] || return
    ${ECHO} -e "[ WARN ]"  >> /run/var/bootlog
 }
 
@@ -165,6 +169,7 @@ echo_skipped()
    ${ECHO} -e "${NORMAL}"
    boot_mesg_flush
 
+   [ -d /run/var ] || return
    ${ECHO} -e "  [ SKIP ]" >> /run/var/bootlog
 }
 
@@ -714,6 +719,7 @@ log_success_msg()
    ${ECHO} -n -e "${BOOTMESG_PREFIX}${@}"
    ${ECHO} -e "${SET_COL}""${BRACKET}""[""${SUCCESS}""  OK  ""${BRACKET}""]""${NORMAL}"
 
+   [ -d /run/var ] || return 0
    ${ECHO} -n -e "${@}  [ OK ]"  >> /run/var/bootlog
    return 0
 }
@@ -736,6 +742,7 @@ log_failure_msg() {
    ${ECHO} -n -e "${BOOTMESG_PREFIX}${@}"
    ${ECHO} -e "${SET_COL}""${BRACKET}""[""${FAILURE}"" FAIL ""${BRACKET}""]""${NORMAL}"
 
+   [ -d /run/var ] || return 0
    ${ECHO} -e "${@}  [ FAIL ]" >> /run/var/bootlog
    return 0
 }
@@ -758,6 +765,7 @@ log_warning_msg() {
    ${ECHO} -n -e "${BOOTMESG_PREFIX}${@}"
    ${ECHO} -e "${SET_COL}""${BRACKET}""[""${WARNING}"" WARN ""${BRACKET}""]""${NORMAL}"
 
+   [ -d /run/var ] || return 0
    ${ECHO} -e "${@}  [ WARN ]" >> /run/var/bootlog
    return 0
 }
@@ -780,6 +788,7 @@ log_skipped_msg() {
    ${ECHO} -n -e "${BOOTMESG_PREFIX}${@}"
    ${ECHO} -e "${SET_COL}""${BRACKET}""[""${WARNING}"" SKIP ""${BRACKET}""]""${NORMAL}"
 
+   [ -d /run/var ] || return 0
    ${ECHO} -e "${@}  [ SKIP ]" >> /run/var/bootlog
    return 0
 }
diff --git a/bootscripts/lfs/init.d/sysklogd b/bootscripts/lfs/init.d/sysklogd
index fdb9380cb..7e079abf5 100644
--- a/bootscripts/lfs/init.d/sysklogd
+++ b/bootscripts/lfs/init.d/sysklogd
@@ -30,7 +30,7 @@
 case "${1}" in
    start)
       boot_mesg "Starting system log daemon..."
-      PARMS=${SYSKLOGD_PARMS=-'-m 0'}
+      PARMS=${SYSKLOGD_PARMS-'-m 0'}
       loadproc syslogd $PARMS
 
       boot_mesg "Starting kernel log daemon..."
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 2f18c2c4d..5ec523c16 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,6 +37,15 @@
 
 -->
     <listitem>
+      <para>2011-08-03</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Minor corrections to bootscripts.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2011-08-02</para>
       <itemizedlist>
         <listitem>
diff --git a/general.ent b/general.ent
index dda198398..c17c2164f 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20110802">
-<!ENTITY releasedate "Aug 2, 2011">
+<!ENTITY version "SVN-20110803">
+<!ENTITY releasedate "Aug 3, 2011">
 <!ENTITY copyrightdate "1999-2011"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "7.0">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index 9b0f3161e..67b58a172 100644
--- a/packages.ent
+++ b/packages.ent
@@ -297,7 +297,7 @@
 <!ENTITY less-ch6-du "3.5 MB">
 <!ENTITY less-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY lfs-bootscripts-version "20110802">                 <!-- Scripts depend on this format -->
+<!ENTITY lfs-bootscripts-version "20110803">                 <!-- Scripts depend on this format -->
 <!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB">         <!-- Updated in Makefile -->
 <!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2">
 <!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM">           <!-- Updated in Makefile -->