From: ankry <ankry@pld-linux.org>
Date: Thu, 15 May 2003 21:28:05 +0000 (+0000)
Subject: - LSB conformance changes
X-Git-Tag: auto/ac/Canna-3_5b2-43~5
X-Git-Url: http://git.pld-linux.org/?p=packages%2FCanna.git;a=commitdiff_plain;h=dc2daaee984568c9980350488baa95bd1efc5ebf

- LSB conformance changes

Changed files:
    Canna.init -> 1.4
---

diff --git a/Canna.init b/Canna.init
index 46ea156..0dc1c5d 100644
--- a/Canna.init
+++ b/Canna.init
@@ -11,6 +11,7 @@
 # Get service config
 [ -f /etc/sysconfig/canna ] && . /etc/sysconfig/canna
 
+RETVAL=0
 case "$1" in
   start)
 	if [ ! -f /var/lock/subsys/canna ]; then
@@ -19,39 +20,32 @@ case "$1" in
 		daemon "su - canna -s /bin/sh -c '/usr/sbin/cannaserver -syslog'"
 		RETVAL=$?
 		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/canna
-		exit $RETVAL
 	else
 		msg_already_running Canna
-		exit 1
 	fi
         ;;
   stop)
 	if [ -f /var/lock/subsys/canna ]; then
 		msg_stopping Canna
 		/usr/sbin/cannakill
-		RETVAL=$?
-		if [ $RETVAL -eq 0 ]; then
-			ok
-		else
-			fail
-		fi
+		[ $? -eq 0 ] && ok || fail
 		rm -f /tmp/.iroha_unix/IROHA /var/lock/subsys/canna
-		exit $RETVAL
 	else
 		msg_not_running Canna
-		exit 1
 	fi
         ;;
   status)
         status cannaserver
+	exit $?
         ;;
-  restart|reload)
+  restart|force-reload)
         $0 stop
         $0 start
+	exit $?
         ;;
   *)
-        msg_usage "$0 {start|stop|restart|reload|condrestart|status}"
-        exit 1
+        msg_usage "$0 {start|stop|restart|force-reload|status}"
+        exit 3
 esac
  
-exit 0
+exit $RETVAL