diff options
| author | DJ Lucas <dj@linuxfromscratch.org> | 2010-06-27 05:32:22 +0000 |
|---|---|---|
| committer | DJ Lucas <dj@linuxfromscratch.org> | 2010-06-27 05:32:22 +0000 |
| commit | d2abc4d35c07366911be101248c4d2dee8ff221b (patch) | |
| tree | bd661305dba99b2e9677a86ccf6ad7415047c327 | |
| parent | 6d4552205c487ce20761686f75358cadd57b8c73 (diff) | |
Sync to main. Updated lsb-v3 scripts to account for change in sysvinit version.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9321 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
| -rw-r--r-- | bootscripts/contrib/lsb-v3/ChangeLog | 2 | ||||
| -rw-r--r-- | bootscripts/contrib/lsb-v3/init.d/sendsignals | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/bootscripts/contrib/lsb-v3/ChangeLog b/bootscripts/contrib/lsb-v3/ChangeLog index f5620de28..946e72d34 100644 --- a/bootscripts/contrib/lsb-v3/ChangeLog +++ b/bootscripts/contrib/lsb-v3/ChangeLog @@ -1,5 +1,7 @@ ChangeLog +20100627 - [dj] * Sync to LFS-Bootscripts-20100627 (killall in new sysvinit). + 20100529 - [matthew] * Only copy /lib/udev/devices/null, as Udev >= 155 copies devices from /lib/udev/devices to /dev itself. diff --git a/bootscripts/contrib/lsb-v3/init.d/sendsignals b/bootscripts/contrib/lsb-v3/init.d/sendsignals index 754e1cb1f..ce42c87ef 100644 --- a/bootscripts/contrib/lsb-v3/init.d/sendsignals +++ b/bootscripts/contrib/lsb-v3/init.d/sendsignals @@ -21,7 +21,10 @@ case "${1}" in message="Sending all processes the TERM signal..." killall5 -15 error_value=${?} - + # Account for successful return value of 2 + if [ ${error_value} == 2 ] + error_value="0" + fi sleep 3 (exit ${error_value}) @@ -30,6 +33,10 @@ case "${1}" in message="Sending all processes the KILL signal..." killall5 -9 error_value=${?} + # Account for successful return value of 2 + if [ ${error_value} == 2 ] + error_value="0" + fi sleep 3 |