- fixed previous change

[packages/bootparamd.git] / bootparamd.init

diff --git a/bootparamd.init b/bootparamd.init
index 0230fa648f3910b32206418288619483b930fe94..e91e05af481eabd82c379f96d99bd4f98d87a893 100644 (file)
--- a/bootparamd.init
+++ b/bootparamd.init
@@ -14,11 +14,16 @@
 . /etc/sysconfig/network
 
 # Check that networking is up.
-if is_no "${NETWORKING}"; then
-       msg_Network_Down rwalld
-       exit 1
+if is_yes "${NETWORKING}"; then
+       if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
+               msg_network_down rwalld
+               exit 1
+       fi
+else
+       exit 0
 fi
 
+RETVAL=0
 # See how we were called.
 case "$1" in
   start)
@@ -27,36 +32,33 @@ case "$1" in
                msg_starting rpc.bootparamd
                daemon rpc.bootparamd
                touch /var/lock/subsys/rpc.bootparamd
-               RETVAL2=$?
-               if [ $RETVAL -eq 0 -a $RETVAL2 -eq 0 ]; then
-                       touch /var/lock/subsys/rpc.bootparamd
-                       RETVAL=1
-               fi
+               RETVAL=$?
+               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/rpc.bootparamd
        else
-               msg_Already_Running rpc.bootparamd
-               exit 1
+               msg_already_running rpc.bootparamd
        fi
-        ;;
+       ;;
   stop)
        if [ -f /var/lock/subsys/rpc.bootparamd ]; then
                msg_stopping rpc.bootparamd
                killproc rpc.bootparamd
                rm -f /var/lock/subsys/rpc.bootparamd >/dev/null 2>&1
        else
-               msg_Not_Running rpc.bootparamd
-               exit 1
+               msg_not_running rpc.bootparamd
        fi      
-        ;;
+       ;;
   status)
        status rpc.bootparamd
+       exit $?
        ;;
-  reload,restart,force-reload)
+  restart|force-reload)
        $0 stop
        $0 start
+       exit $?
        ;;
   *)
-       msg_Usage "$0 {start|stop|status|restart|reload|force-reload}"
-       exit 1
+       msg_usage "$0 {start|stop|restart|force-reload|status}"
+       exit 3
        ;;
 esac