Merge branch 'thirteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into thirteen

[ipfire-2.x.git] / src / initscripts / init.d / sendsignals

diff --git a/src/initscripts/init.d/sendsignals b/src/initscripts/init.d/sendsignals
index 4c3d05eda2a22e3707dcdc378f5ce3f55a96a6b4..58c16c3b42fedd64c0badade1c3003ffb2328c40 100644 (file)
--- a/src/initscripts/init.d/sendsignals
+++ b/src/initscripts/init.d/sendsignals
@@ -17,25 +17,25 @@
 
 case "${1}" in
        stop)
-               boot_mesg "Sending all processes the TERM signal..."
+               boot_mesg "Sending all processes the TERM signal..." ${WARN}
                killall5 -15
                error_value=${?}
 
                sleep ${KILLDELAY}
 
-               if [ "${error_value}" = 0 ]; then
+               if [ "${error_value}" = 0 -o "${error_value}" = 2 ]; then
                        echo_ok
                else
                        echo_failure
                fi
 
-               boot_mesg "Sending all processes the KILL signal..."
+               boot_mesg "Sending all processes the KILL signal..." ${ERR}
                killall5 -9
                error_value=${?}
 
                sleep ${KILLDELAY}
 
-               if [ "${error_value}" = 0 ]; then
+               if [ "${error_value}" = 0 -o "${error_value}" = 2 ]; then
                        echo_ok
                else
                        echo_failure