- rel 3

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

diff --git a/FreeWnn-kWnn.init b/FreeWnn-kWnn.init
index 19fd846e5c5830055a1f07811b4355d688706f26..a2bdd29fdcf2ce6c0298b1c7166a581fbdf54f0b 100644 (file)
--- a/FreeWnn-kWnn.init
+++ b/FreeWnn-kWnn.init
@@ -18,7 +18,7 @@
 
 # Check that networking is up.
 if is_yes "${NETWORKING}"; then
-       if [ ! -f /var/lock/subsys/network -a != stop -a != status ]; then
+       if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
                msg_network_down kWnn
                exit 1
        fi
@@ -31,13 +31,10 @@ if [ -f /etc/FreeWnn/ko_KR/kserverrc ]; then
        exit 6
 fi
 
-RETVAL=0
-# See how we were called.
-case "$1" in
-    start)
+start() {
        if [ ! -f /var/lock/subsys/kWnn ]; then
                msg_starting kWnn
-               rm -f /tmp/jd_sockV4
+               rm -f /tmp/kd_sockV4
                ( su - wnn -s /bin/sh -c '/usr/bin/kserver' | grep "Finished" > /dev/null ) \
                        && ok || fail
                RETVAL=$?
@@ -45,27 +42,53 @@ case "$1" in
        else
                msg_already_running kWnn
        fi
-       ;;
-    stop)
+}
+
+stop() {
        if [ -f /var/lock/subsys/kWnn ]; then
                msg_stopping kWnn
                killproc kserver
-               rm -f /var/lock/subsys/kWnn /tmp/jd_sockV4
+               rm -f /var/lock/subsys/kWnn /tmp/kd_sockV4
        else
                msg_not_running kWnn
        fi
+}
+
+condrestart() {
+       if [ ! -f /var/lock/subsys/kWnn ]; then
+               msg_not_running kWnn
+               RETVAL=$1
+               return
+       fi
+       stop
+       start
+}
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+  start)
+       start
+       ;;
+  stop)
+       stop
        ;;
-    status)
+  status)
        status kserver
-       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