updated

Changed files:
    nut-upsmon.init -> 1.3
    nut.init -> 1.7

diff --git a/nut-upsmon.init b/nut-upsmon.init
index 9ec1da63195b94da06e545879c34d6ecc1ef4900..ea956bc17c04efe8b325312a64a7e57266188cdc 100644 (file)
--- a/nut-upsmon.init
+++ b/nut-upsmon.init
@@ -18,6 +18,7 @@
 # Get config.
 [ -f /etc/sysconfig/upsmon ] && . /etc/sysconfig/upsmon
 
+
 # See how we are called.
 case "$1" in
   start)
@@ -25,9 +26,11 @@ case "$1" in
        if [ ! -f /var/lock/subsys/upsmon ]; then
                msg_starting "UPSmon"
                daemon upsmon
-               [ "$?" -eq 0 ] && touch /var/lock/subsys/upsmon
+               RETVAL=$?
+               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/upsmon
        else
                msg_already_running "UPSmon"
+               exit 1
        fi
        ;;
   stop)
@@ -37,6 +40,7 @@ case "$1" in
                rm -f /var/lock/subsys/upsmon
        else
                msg_not_running "UPSmon"
+               exit 1
        fi
        ;;
   restart|reload)
@@ -56,3 +60,5 @@ case "$1" in
        exit 1
        ;;
 esac 
+
+exit $RETVAL

diff --git a/nut.init b/nut.init
index b8966816306c42ead7ffe77b13ef0d0a87f8c51f..45bd2fe2179da76d8dc26a4b28c9fe33b582a2de 100644 (file)
--- a/nut.init
+++ b/nut.init
@@ -22,6 +22,19 @@
 [ -n "$TCP_PORT" ] && OPTIONS="-t $TCP_PORT"
 [ -n "$BIND_ADDRESS" ] && OPTIONS="$OPTIONS -i $BIND_ADDRESS"
 
+if [ -n "$BIND_ADDRESS" ] || [ -n "$TCP_PORT" ]; then
+       # Check that networking is up.
+       if is_yes "${NETWORKING}"; then
+               if [ ! -f /var/lock/subsys/network ]; then
+                       msg_network_down ntp
+                       exit 1
+               fi
+       else
+               exit 0
+       fi
+fi
+
+
 # See how we are called.
 case "$1" in
   start)
@@ -51,6 +64,7 @@ case "$1" in
                rm -f /var/lock/subsys/ups
        else
                msg_not_running "UPS daemon"
+               exit 1
        fi
        ;;
   restart)
@@ -58,10 +72,15 @@ case "$1" in
        $0 start
        ;;
   reload)
-       show "Reloading UPS drivers"
-       daemon /usr/lib/nut/upsdrvctl reload
-       msg_reloading "UPS network daemon"
-       daemon upsd -c reload
+       if [ -f /var/lock/subsys/ups ]; then
+               show "Reloading UPS drivers"
+               daemon /usr/lib/nut/upsdrvctl reload
+               msg_reloading "UPS network daemon"
+               daemon upsd -c reload
+       else
+               msg_not_running "UPS daemon"
+               exit 1
+       fi
        ;;
   force-reload)
        $0 reload