- fixed previous change

[packages/coda.git] / coda.update.init

diff --git a/coda.update.init b/coda.update.init
index 326f8b846ea9cc1cb82cc1ce687dc5a02b9af2ed..23b35c3879b3f51356760cacd5e556e8eec24b7b 100644 (file)
--- a/coda.update.init
+++ b/coda.update.init
@@ -14,49 +14,60 @@
 . /etc/sysconfig/network
 
 # Check that networking is up
-if is_no "${NETWORKING}"; then
-    msg_network_down update
-    exit 1
+if is_yes "${NETWORKING}"; then
+       if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
+               msg_network_down update
+               exit 1
+       fi
+else
+       exit 0
 fi
 
+RETVAL=0
 case "$1" in
-    start)
-        # Check if the service is already running?
-       if [ -f /var/lock/subsys/update ]; then
-           msg_already_running update
+  start)
+       # Check if the service is already running?
+       if [ ! -f /var/lock/subsys/update ]; then
+               msg_starting rpc2portmap
+               daemon rpc2portmap
+               RETVAL=$?
+               msg_starting updatesrv
+               daemon updatesrv
+               RET=$?
+               [ RETVAL -eq 0 ] && RETVAL=$RET
+               msg_starting updateclnt
+               daemon updateclnt -h `cat /var/lib/vice/db/scm`
+               RET=$?
+               if [ RETVAL -eq 0 ] && RETVAL=$RET
+               [ RETVAL -eq 0 ] && touch /var/lock/subsys/update
        else
-           msg_starting rpc2portmap
-           daemon rpc2portmap
-           msg_starting updatesrv
-           daemon updatesrv
-           msg_starting updateclnt
-           daemon updateclnt -h `cat /var/lib/vice/db/scm`
-           RETVAL=$?
-           [ RETVAL -eq 0 ] && touch /var/lock/subsys/update
+               msg_already_running update
        fi
-        ;;
-    stop)
-        if [ -f /var/lock/subsys/update ]; then
-           msg_stopping updateclnt
-           killproc updateclnt
-           msg_stopping updatesrv
-           killproc updatesrv
-           msg_stopping rpc2portmap
-           killproc rpc2portmap
-           rm -f /var/lock/subsys/update
+       ;;
+  stop)
+       if [ -f /var/lock/subsys/update ]; then
+               msg_stopping updateclnt
+               killproc updateclnt
+               msg_stopping updatesrv
+               killproc updatesrv
+               msg_stopping rpc2portmap
+               killproc rpc2portmap
+               rm -f /var/lock/subsys/update
        else
-           msg_Not_Running update
+               msg_not_running update
        fi
-        ;;
-    restart)
-        $0 stop
+       ;;
+  status)
+       ;;
+  restart|force-reload)
+       $0 stop
        $0 start
-        ;;
-    *)
-        msg_usage "$0 {start|stop|restart}"
-       exit 1
+       exit $?
+       ;;
+  *)
+       msg_usage "$0 {start|stop|restart|force-reload|status}"
+       exit 3
        ;;
 esac
 
 exit $RETVAL
-