- cleaning

Changed files:
    FreeWnn-cWnn.init -> 1.2
    FreeWnn-kWnn.init -> 1.2
    FreeWnn-tWnn.init -> 1.2
    FreeWnn.init -> 1.2

diff --git a/FreeWnn-cWnn.init b/FreeWnn-cWnn.init
index 14b203e1f383378f5397a11586136e79c31d339f..477dc61995752b89f1c56cb60c2c6f11b551987d 100644 (file)
--- a/FreeWnn-cWnn.init
+++ b/FreeWnn-cWnn.init
@@ -17,9 +17,13 @@
 [ -f /etc/sysconfig/cWnn ] && . /etc/sysconfig/cWnn
 
 # Check that networking is up.
-if is_no "${NETWORKING}"; then
-       msg_network_down cWnn
-       exit 1
+if is_yes "${NETWORKING}"; then
+       if [ ! -f /var/lock/subsys/network ]; then
+               msg_network_down cWnn
+               exit 1
+       fi
+else
+       exit 0
 fi
 
 [ -f /etc/FreeWnn/zh_CN/cserverrc ] || exit 1
@@ -60,8 +64,8 @@ case "$1" in
        $0 start
        ;;
     *)
-       msg_usage "$0 {start|stop|status|restart|reload}"
-        exit 1
+       msg_usage "$0 {start|stop|restart|reload|status}"
+       exit 1
        ;;
 esac
 

diff --git a/FreeWnn-kWnn.init b/FreeWnn-kWnn.init
index cecf60de6d515472d7d365f34ec8a8e4eb1ea045..831db3f7062ae01d9d782ebab08b9ffc168f6969 100644 (file)
--- a/FreeWnn-kWnn.init
+++ b/FreeWnn-kWnn.init
@@ -17,9 +17,13 @@
 [ -f /etc/sysconfig/kWnn ] && . /etc/sysconfig/kWnn
 
 # Check that networking is up.
-if is_no "${NETWORKING}"; then
-       msg_network_down kWnn
-       exit 1
+if is_yes "${NETWORKING}"; then
+       if [ ! -f /var/lock/subsys/network ]; then
+               msg_network_down kWnn
+               exit 1
+       fi
+else
+       exit 0
 fi
 
 [ -f /etc/FreeWnn/ko_KR/kserverrc ] || exit 1
@@ -60,8 +64,8 @@ case "$1" in
        $0 start
        ;;
     *)
-       msg_usage "$0 {start|stop|status|restart|reload}"
-        exit 1
+       msg_usage "$0 {start|stop|restart|reload|status}"
+       exit 1
        ;;
 esac
 

diff --git a/FreeWnn-tWnn.init b/FreeWnn-tWnn.init
index b4b5bd14e19d67d14ca4651e76ab67dbf1105f5c..5f3816665e4bb31e7d53cc58c8db6f94711fb342 100644 (file)
--- a/FreeWnn-tWnn.init
+++ b/FreeWnn-tWnn.init
@@ -17,9 +17,13 @@
 [ -f /etc/sysconfig/tWnn ] && . /etc/sysconfig/tWnn
 
 # Check that networking is up.
-if is_no "${NETWORKING}"; then
-       msg_network_down tWnn
-       exit 1
+if is_yes "${NETWORKING}"; then
+       if [ ! -f /var/lock/subsys/network ]; then
+               msg_network_down tWnn
+               exit 1
+       fi
+else
+       exit 0
 fi
 
 [ -f /etc/FreeWnn/zh_TW/tserverrc ] || exit 1
@@ -60,8 +64,8 @@ case "$1" in
        $0 start
        ;;
     *)
-       msg_usage "$0 {start|stop|status|restart|reload}"
-        exit 1
+       msg_usage "$0 {start|stop|restart|reload|status}"
+       exit 1
        ;;
 esac
 

diff --git a/FreeWnn.init b/FreeWnn.init
index e0aadc303c2af116ca6ef245a709e0441a083d3a..f4802c86a48838bcb866ceb46888e1f814790071 100644 (file)
--- a/FreeWnn.init
+++ b/FreeWnn.init
@@ -18,9 +18,13 @@
 [ -f /etc/sysconfig/FreeWnn ] && . /etc/sysconfig/FreeWnn
 
 # Check that networking is up.
-if is_no "${NETWORKING}"; then
-       msg_network_down FreeWnn
-       exit 1
+if is_yes "${NETWORKING}"; then
+       if [ ! -f /var/lock/subsys/network ]; then
+               msg_network_down FreeWnn
+               exit 1
+       fi
+else
+       exit 0
 fi
 
 [ -f /etc/FreeWnn/ja/jserverrc ] || exit 1
@@ -61,7 +65,7 @@ case "$1" in
        $0 start
        ;;
     *)
-       msg_usage "$0 {start|stop|status|restart|reload}"
+       msg_usage "$0 {start|stop|restart|reload|status}"
        exit 1
        ;;
 esac