Rel 3; rediff patches

[packages/FreeWnn.git] / FreeWnn-cWnn.init

diff --git a/FreeWnn-cWnn.init b/FreeWnn-cWnn.init
index 94b9e58006509b0f2c071de234241ca8336f0e14..abc2a5acb97e4860e12aa7055ce168a5d2c606b4 100644 (file)
--- a/FreeWnn-cWnn.init
+++ b/FreeWnn-cWnn.init
@@ -18,7 +18,7 @@
 
 # Check that networking is up.
 if is_yes "${NETWORKING}"; then
-       if [ ! -f /var/lock/subsys/network ]; then
+       if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
                msg_network_down cWnn
                exit 1
        fi
@@ -26,44 +26,69 @@ else
        exit 0
 fi
 
-[ -f /etc/FreeWnn/zh_CN/cserverrc ] || exit 1
+if [ -f /etc/FreeWnn/zh_CN/cserverrc ]; then
+       nls "%s config %s does not exist." cWnn /etc/FreeWnn/zh_CN/cserverrc
+       exit 6
+fi
 
-RETVAL=0
-# See how we were called.
-case "$1" in
-  start)
+start() {
        if [ ! -f /var/lock/subsys/cWnn ]; then
                msg_starting cWnn
-               rm -f /tmp/jd_sockV4
-               ( su - wnn -s /bin/sh -c '/usr/bin/cserver' | grep "Finished" > /dev/null ) \
+               rm -f /tmp/cd_sockV4
+               ( su - wnn -s /bin/sh -c '/usr/sbin/cserver' | grep "Finished" > /dev/null ) \
                        && ok || fail
                RETVAL=$?
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/cWnn || RETVAL=1
        else
                msg_already_running cWnn
        fi
-       ;;
-  stop)
+}
+
+stop() {
        if [ -f /var/lock/subsys/cWnn ]; then
                msg_stopping cWnn
                killproc cserver
-               rm -f /var/lock/subsys/cWnn /tmp/jd_sockV4
-               exit $RETVAL
+               rm -f /var/lock/subsys/cWnn /tmp/cd_sockV4
        else
                msg_not_running cWnn
        fi
+}
+
+condrestart() {
+       if [ ! -f /var/lock/subsys/cWnn ]; then
+               msg_not_running cWnn
+               RETVAL=$1
+               return
+       fi
+       stop
+       start
+}
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+  start)
+       start
+       ;;
+  stop)
+       stop
        ;;
   status)
        status cserver
-       exit $?
+       RETVAL=$?
+       ;;
+  restart)
+       stop
+       start
+       ;;
+  try-restart)
+       condrestart 0
        ;;
-  restart|force-reload)
-       $0 stop
-       $0 start
-       exit $?
+  force-reload)
+       condrestart 7
        ;;
   *)
-       msg_usage "$0 {start|stop|restart|force-reload|status}"
+       msg_usage "$0 {start|stop|restart|try-restart|force-reload|status}"
        exit 3
        ;;
 esac