Jan Šafránek 114475
523177:  Initscript: ipmidetectd incorrect exit codes
Jan Šafránek 114475
523169:  Initscript: ipmidetectd missing actions
Jan Šafránek 114475
Jan Šafránek 114475
Implement try-restart and force-reload actions.
Jan Šafránek 114475
Return correct exit codes.
Jan Šafránek 114475
Jan Šafránek 114475
diff -up freeipmi-0.7.12/ipmidetect/freeipmi-ipmidetectd.init.lsb freeipmi-0.7.12/ipmidetect/freeipmi-ipmidetectd.init
Jan Šafránek 114475
--- freeipmi-0.7.12/ipmidetect/freeipmi-ipmidetectd.init.lsb	2007-12-14 20:16:25.000000000 +0100
Jan Šafránek 114475
+++ freeipmi-0.7.12/ipmidetect/freeipmi-ipmidetectd.init	2009-09-14 15:38:12.000000000 +0200
Jan Šafránek 114475
@@ -14,6 +14,7 @@
Jan Šafránek 114475
 ### END INIT INFO
Jan Šafránek 114475
 
Jan Šafránek 114475
 IPMIDETECTD=/usr/sbin/ipmidetectd
Jan Šafránek 114475
+IPMIDETECTD_CFG=/etc/ipmidetectd.cfg
Jan Šafránek 114475
 
Jan Šafránek 114475
 [ -f $IPMIDETECTD ] || exit 1
Jan Šafránek 114475
 
Jan Šafránek 114475
@@ -21,6 +22,11 @@ IPMIDETECTD=/usr/sbin/ipmidetectd
Jan Šafránek 114475
 if [ -f /etc/rc.d/init.d/functions ] ; then
Jan Šafránek 114475
     . /etc/rc.d/init.d/functions
Jan Šafránek 114475
     Xstart() {
Jan Šafránek 114475
+        if [ ! -f IPMIDETECTD_CFG ] ; then
Jan Šafránek 114475
+            failure; echo
Jan Šafránek 114475
+            RETVAL=6
Jan Šafránek 114475
+            return
Jan Šafránek 114475
+        fi
Jan Šafránek 114475
         daemon $IPMIDETECTD
Jan Šafránek 114475
         RETVAL=$?
Jan Šafránek 114475
         echo
Jan Šafránek 114475
@@ -89,7 +95,7 @@ case "$1" in
Jan Šafránek 114475
    	echo -n "Shutting down ipmidetectd: "
Jan Šafránek 114475
 	Xstop
Jan Šafránek 114475
    	;;
Jan Šafránek 114475
-  restart|reload)
Jan Šafránek 114475
+  restart|force-reload)
Jan Šafránek 114475
    	$0 stop
Jan Šafránek 114475
    	$0 start
Jan Šafránek 114475
    	RETVAL=$?
Jan Šafránek 114475
@@ -97,10 +103,11 @@ case "$1" in
Jan Šafránek 114475
   status)
Jan Šafránek 114475
         Xstatus
Jan Šafránek 114475
    	;;
Jan Šafránek 114475
-  condrestart)
Jan Šafránek 114475
+  condrestart|try-restart)
Jan Šafránek 114475
         Xcondrestart
Jan Šafránek 114475
    	;;
Jan Šafránek 114475
   *)
Jan Šafránek 114475
-	echo "Usage: $0 {start|stop|restart|status|condrestart}"
Jan Šafránek 114475
+	echo "Usage: $0 {start|stop|restart|status|condrestart|force-reload|try-restart}"
Jan Šafránek 8e7748
-	exit 1
Jan Šafránek 8e7748
+	exit 2
Jan Šafránek 114475
 esac
Jan Šafránek 114475
+exit $RETVAL