Fixes to bootscripts:

  * Remove unneeded function literals.
  * Fix pidlist logic in statusproc.
  * Fix statusproc usage statement.
  * Add nodevtmpfs in mountfs stop.
  * Be consistent wtih #!/bin/sh

Add nodump to xml so command to print out 70-persistent-net.rules 
will not be used in jhalfs. Fixes a problem in kvm.



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

8 files changed, 27 insertions, 12 deletions

diff --git a/bootscripts/lfs/init.d/cleanfs b/bootscripts/lfs/init.d/cleanfs
index 25a21bcf4..2dee92967 100644
--- a/bootscripts/lfs/init.d/cleanfs
+++ b/bootscripts/lfs/init.d/cleanfs
@@ -30,7 +30,7 @@
 . /lib/lsb/init-functions
 
 # Function to create files/directory on boot.
-function create_files() 
+create_files() 
 {
    # Input to file descriptor 9 and output to stdin (redirection)
    exec 9>&0 < /etc/sysconfig/createfiles
diff --git a/bootscripts/lfs/init.d/mountfs b/bootscripts/lfs/init.d/mountfs
index d51b013e5..74e87baff 100644
--- a/bootscripts/lfs/init.d/mountfs
+++ b/bootscripts/lfs/init.d/mountfs
@@ -62,7 +62,7 @@ case "${1}" in
    stop)
       # Don't unmount tmpfs like /run
       log_info_msg "Unmounting all other currently mounted file systems..."
-      umount -a -d -r -t notmpfs,nosysfs >/dev/null
+      umount -a -d -r -t notmpfs,nosysfs,nodevtmpfs >/dev/null
       evaluate_retval
       exit 0
       ;;
diff --git a/bootscripts/lfs/init.d/rc b/bootscripts/lfs/init.d/rc
index e70278b8d..f10d22dd4 100644
--- a/bootscripts/lfs/init.d/rc
+++ b/bootscripts/lfs/init.d/rc
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 ########################################################################
 # Begin rc
 #
@@ -14,7 +14,7 @@
 
 . /lib/lsb/init-functions
 
-function print_error_msg()
+print_error_msg()
 {
    log_failure_msg
    # $i is set when called
@@ -33,7 +33,7 @@ function print_error_msg()
    wait_for_user
 }
 
-function check_script_status()
+check_script_status()
 {
    # $i is set when called
    if [ ! -f ${i} ]; then
@@ -47,7 +47,7 @@ function check_script_status()
    fi
 }
 
-function run()
+run()
 {
    if [ -z $interactive ]; then
       ${1} ${2}
diff --git a/bootscripts/lfs/lib/services/init-functions b/bootscripts/lfs/lib/services/init-functions
index a830a3ae6..415c65ba8 100644
--- a/bootscripts/lfs/lib/services/init-functions
+++ b/bootscripts/lfs/lib/services/init-functions
@@ -457,7 +457,7 @@ pidofproc()
         kill -0 ${pid} 2> /dev/null
 
         if [ "${?}" -eq "0" ]; then
-            lpids="${pids}${pid} "
+            lpids="${lpids}${pid} "
         else
             exitstatus="1"
         fi
@@ -490,7 +490,7 @@ statusproc()
    local pidlist
 
    if [ "${#}" = "0" ]; then
-      echo "Usage: [-p pidfle] statusproc {program}"
+      echo "Usage: statusproc [-p pidfle] {program}"
       exit 1
    fi
 
@@ -514,7 +514,7 @@ statusproc()
        esac
    done
 
-   if [ -z "${pidfile}" ]; then
+   if [ -n "${pidfile}" ]; then
       pidlist=`pidofproc -p "${pidfile}" $@`
    else
       pidlist=`pidofproc $@`
diff --git a/bootscripts/lfs/sbin/ifdown b/bootscripts/lfs/sbin/ifdown
index 8feba6729..9d556ebc8 100755
--- a/bootscripts/lfs/sbin/ifdown
+++ b/bootscripts/lfs/sbin/ifdown
@@ -1,4 +1,4 @@
-#!/bin/bash 
+#!/bin/sh 
 ########################################################################
 # Begin /sbin/ifdown
 #
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 76f466758..310820403 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -41,6 +41,21 @@
       <para>2012-02-04</para>
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Fixes to bootscripts:
+          <itemizedlist>
+            <listitem><para>Remove unneeded function literals.</para></listitem>
+            <listitem><para>Fix pidlist logic in statusproc.</para></listitem>
+            <listitem><para>Fix statusproc usage statement.</para></listitem>
+            <listitem><para>Add nodevtmpfs in mountfs stop.</para></listitem>
+          </itemizedlist>
+          </para>
+        </listitem>
+         <listitem>
+           <para>[bdubbs] Add nodump to xml so command to print out 
+           70-persistent-net.rules will not be used in jhalfs.
+           Fixes a problem in kvm.</para>
+         </listitem>
+        <listitem>
           <para>[bryan] - Fix up text in section 7.4 ("device and module
           handling"), and change the recommendation for wrapper modules to
           use kmod's support for soft post-dependencies instead.  Fixes
diff --git a/chapter07/network.xml b/chapter07/network.xml
index 8bb099adf..6946e693d 100644
--- a/chapter07/network.xml
+++ b/chapter07/network.xml
@@ -51,7 +51,7 @@ done</userinput></screen>
     <para>Now, inspect the <filename>/etc/udev/rules.d/70-persistent-net.rules</filename>
     file, to find out which name was assigned to which network device:</para>
 
-<screen><userinput>cat /etc/udev/rules.d/70-persistent-net.rules</userinput></screen>
+<screen role="nodump"><userinput>cat /etc/udev/rules.d/70-persistent-net.rules</userinput></screen>
 
     <para>The file begins with a comment block followed by two lines for each
     NIC. The first line for each NIC is a commented description showing its
diff --git a/packages.ent b/packages.ent
index 7c94f3ffc..c3fef36ec 100644
--- a/packages.ent
+++ b/packages.ent
@@ -305,7 +305,7 @@
 <!ENTITY less-ch6-du "3.5 MB">
 <!ENTITY less-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY lfs-bootscripts-version "20120127">                 <!-- Scripts depend on this format -->
+<!ENTITY lfs-bootscripts-version "20120204">                 <!-- 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 -->