diff options
| author | Bruce Dubbs <bdubbs@linuxfromscratch.org> | 2012-02-05 06:05:45 +0000 |
|---|---|---|
| committer | Bruce Dubbs <bdubbs@linuxfromscratch.org> | 2012-02-05 06:05:45 +0000 |
| commit | 2f0d64dc59a3ca3ac86d876bacc2e806fc113334 (patch) | |
| tree | ec5a3809f3771297183775eda2717c191231a4ae /bootscripts | |
| parent | 841b7235aa2c0d12622dff65a3a6c763f6f7493e (diff) | |
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
Diffstat (limited to 'bootscripts')
| -rw-r--r-- | bootscripts/lfs/init.d/cleanfs | 2 | ||||
| -rw-r--r-- | bootscripts/lfs/init.d/mountfs | 2 | ||||
| -rw-r--r-- | bootscripts/lfs/init.d/rc | 8 | ||||
| -rw-r--r-- | bootscripts/lfs/lib/services/init-functions | 6 | ||||
| -rwxr-xr-x | bootscripts/lfs/sbin/ifdown | 2 |
5 files changed, 10 insertions, 10 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 # |