commit 1395a66dd92fc736e88467a45c545b033b1b123d
Author: Jakub Bogusz <[email protected]>
Date: Sat Nov 17 17:57:48 2012 +0100
- updated init scripts (added try-restart, adjusted force-reload exit codes
wrt. LSB)
FreeWnn-cWnn.init | 48 +++++++++++++++++++++++++++++++++++-------------
FreeWnn-kWnn.init | 51 +++++++++++++++++++++++++++++++++++++--------------
FreeWnn-tWnn.init | 47 +++++++++++++++++++++++++++++++++++------------
FreeWnn.init | 51 +++++++++++++++++++++++++++++++++++++--------------
4 files changed, 144 insertions(+), 53 deletions(-)
---
diff --git a/FreeWnn-cWnn.init b/FreeWnn-cWnn.init
index 2ae67d0..91e8458 100644
--- a/FreeWnn-cWnn.init
+++ b/FreeWnn-cWnn.init
@@ -31,10 +31,7 @@ if [ -f /etc/FreeWnn/zh_CN/cserverrc ]; then
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
@@ -45,28 +42,53 @@ case "$1" in
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
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
diff --git a/FreeWnn-kWnn.init b/FreeWnn-kWnn.init
index afa6945..0de5cc7 100644
--- a/FreeWnn-kWnn.init
+++ b/FreeWnn-kWnn.init
@@ -31,10 +31,7 @@ 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
@@ -45,8 +42,9 @@ case "$1" in
else
msg_already_running kWnn
fi
- ;;
- stop)
+}
+
+stop() {
if [ -f /var/lock/subsys/kWnn ]; then
msg_stopping kWnn
killproc kserver
@@ -54,18 +52,43 @@ case "$1" in
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
diff --git a/FreeWnn-tWnn.init b/FreeWnn-tWnn.init
index 02841a2..69bf9c6 100644
--- a/FreeWnn-tWnn.init
+++ b/FreeWnn-tWnn.init
@@ -31,10 +31,7 @@ if [ -f /etc/FreeWnn/zh_TW/tserverrc ]; then
exit 6
fi
-RETVAL=0
-# See how we were called.
-case "$1" in
- start)
+start() {
if [ ! -f /var/lock/subsys/tWnn ]; then
msg_starting tWnn
rm -f /tmp/jd_sockV4
@@ -45,8 +42,9 @@ case "$1" in
else
msg_already_running tWnn
fi
- ;;
- stop)
+}
+
+stop() {
if [ -f /var/lock/subsys/tWnn ]; then
msg_stopping tWnn
killproc tserver
@@ -54,18 +52,43 @@ case "$1" in
else
msg_not_running tWnn
fi
+}
+
+condrestart() {
+ if [ ! -f /var/lock/subsys/tWnn ]; then
+ msg_not_running tWnn
+ RETVAL=$1
+ return
+ fi
+ stop
+ start
+}
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+ start)
+ start
+ ;;
+ stop)
+ stop
;;
status)
status tserver
- 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
diff --git a/FreeWnn.init b/FreeWnn.init
index 400c21b..a76a56c 100644
--- a/FreeWnn.init
+++ b/FreeWnn.init
@@ -32,10 +32,7 @@ if [ -f /etc/FreeWnn/ja/jserverrc ]; then
exit 6
fi
-RETVAL=0
-# See how we were called.
-case "$1" in
- start)
+start() {
if [ ! -f /var/lock/subsys/FreeWnn ]; then
msg_starting FreeWnn
rm -f /tmp/jd_sockV4
@@ -46,8 +43,9 @@ case "$1" in
else
msg_already_running FreeWnn
fi
- ;;
- stop)
+}
+
+stop() {
if [ -f /var/lock/subsys/FreeWnn ]; then
msg_stopping FreeWnn
killproc jserver
@@ -55,18 +53,43 @@ case "$1" in
else
msg_not_running FreeWnn
fi
+}
+
+condrestart() {
+ if [ ! -f /var/lock/subsys/FreeWnn ]; then
+ msg_not_running FreeWnn
+ RETVAL=$1
+ return
+ fi
+ stop
+ start
+}
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+ start)
+ start
+ ;;
+ stop)
+ stop
;;
- status)
+ status)
status jserver
- 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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/FreeWnn.git/commitdiff/1395a66dd92fc736e88467a45c545b033b1b123d
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
