SOURCES: hdapsd.init - functions, add try-restart

[glen]

Author: glen                         Date: Fri Mar 27 07:14:04 2009 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- functions, add try-restart

---- Files affected:
SOURCES:
   hdapsd.init (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SOURCES/hdapsd.init
diff -u SOURCES/hdapsd.init:1.5 SOURCES/hdapsd.init:1.6
--- SOURCES/hdapsd.init:1.5	Thu Apr  6 10:05:22 2006
+++ SOURCES/hdapsd.init	Fri Mar 27 08:13:58 2009
@@ -16,11 +16,13 @@
 # Configuration file.
 [ -f /etc/sysconfig/hdapsd ] && . /etc/sysconfig/hdapsd
 
+start() {
+	# Start daemons.
+	if [ -f /var/lock/subsys/hdapsd ]; then
+		msg_already_running hdapsd
+		return
+	fi
 
-RETVAL=0
-# See how we were called.
-case "$1" in
-  start)
   	# check whether kernel is hdaps_protect enabled
 	if [ ! -f /sys/devices/platform/hdaps/position ]; then
 		# it is not, try to load hdaps module and see if that helps
@@ -31,37 +33,59 @@
 		fi;
 	fi;
 	
-	# Start daemons.
+	msg_starting hdapsd
+	daemon hdapsd -d ${HDAPS_DEVICE} -s ${HDAPS_SENSITIVITY} ${HDAPS_OPTIONS} -b
+	RETVAL=$?
+	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/hdapsd
+}
+
+stop() {
+	# Stop daemons.
 	if [ ! -f /var/lock/subsys/hdapsd ]; then
-		msg_starting hdapsd
-		daemon hdapsd -d ${HDAPS_DEVICE} -s ${HDAPS_SENSITIVITY} ${HDAPS_OPTIONS} -b
-		RETVAL=$?
-		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/hdapsd
-	else
-		msg_already_running hdapsd
+		msg_not_running hdapsd
+		return
 	fi
-	;;
-  stop)
-	# Stop daemons.
+
+	msg_stopping hdapsd
+	killproc hdapsd
+	rm -f /var/lock/subsys/hdapsd >/dev/null 2>&1
+}
+
+condrestart() {
 	if [ -f /var/lock/subsys/hdapsd ]; then
-		msg_stopping hdapsd
-		killproc hdapsd
-		rm -f /var/lock/subsys/hdapsd >/dev/null 2>&1
+		stop
+		start
 	else
 		msg_not_running hdapsd
+		RETVAL=$1
 	fi
+}
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+  start)
+  	start
 	;;
-  restart|force-reload)
-	$0 stop
-	$0 start
-	exit $?
+  stop)
+  	stop
+	;;
+  restart)
+	stop
+	start
+	;;
+  try-restart)
+	condrestart 0
+	;;
+  force-reload)
+	condrestart 7
 	;;
   status)
 	status hdapsd
 	exit $?
 	;;
   *)
-	msg_usage "$0 {start|stop|restart|force-reload|status}"
+	msg_usage "$0 {start|stop|restart|try-restart|force-reload|status}"
 	exit 3
 esac
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/hdapsd.init?r1=1.5&r2=1.6&f=u