packages: cronie/cronie.init - add try-restart, update from template.init

[glen]

Author: glen                         Date: Thu Aug 13 10:49:58 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add try-restart, update from template.init

---- Files affected:
packages/cronie:
   cronie.init (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/cronie/cronie.init
diff -u packages/cronie/cronie.init:1.1 packages/cronie/cronie.init:1.2
--- packages/cronie/cronie.init:1.1	Tue Aug 11 22:04:59 2009
+++ packages/cronie/cronie.init	Thu Aug 13 12:49:52 2009
@@ -21,24 +21,49 @@
 
 start() {
 	# Check if the service is already running?
-	if [ ! -f /var/lock/subsys/crond ]; then
-		msg_starting "cronie"
-		daemon /usr/sbin/crond
-		RETVAL=$?
-		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/crond
-	else
-		msg_already_running "cronie"
+	if [ -f /var/lock/subsys/crond ]; then
+		msg_already_running "cronie crond"
+		return
 	fi
+
+	msg_starting "cronie crond"
+	daemon /usr/sbin/crond
+	RETVAL=$?
+	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/crond
 }
 
 stop() {
-	if [ -f /var/lock/subsys/crond ]; then
-		msg_stopping "cronie"
-		killproc crond
-		rm -f /var/lock/subsys/crond
-	else
-		msg_not_running "cronie"
+	if [ ! -f /var/lock/subsys/crond ]; then
+		msg_not_running "cronie crond"
+		return
 	fi
+
+	msg_stopping "cronie crond"
+	killproc crond
+	rm -f /var/lock/subsys/crond
+}
+
+reload() {
+	if [ ! -f /var/lock/subsys/crond ]; then
+		msg_not_running "cronie crond"
+		RETVAL=7
+		return
+	fi
+
+	msg_reloading "cronie crond"
+	killproc crond -HUP
+	RETVAL=$?
+}
+
+condrestart() {
+	if [ ! -f /var/lock/subsys/crond ]; then
+		msg_not_running "cronie crond"
+		RETVAL=$1
+		return
+	fi
+
+	stop
+	start
 }
 
 RETVAL=0
@@ -50,26 +75,22 @@
   stop)
   	stop
 	;;
-  status)
-	status crond
-	exit $?
-	;;
   restart)
 	stop
 	start
 	;;
+  try-restart)
+	condrestart 0
+	;;
   reload|force-reload)
-	if [ -f /var/lock/subsys/crond ]; then
-		msg_reloading "cronie"
-		killproc crond -HUP
-		RETVAL=$?
-	else
-		msg_not_running "cronie"
-		exit 7
-	fi
+  	reload
+	;;
+  status)
+	status crond
+	exit $?
 	;;
   *)
-	msg_usage "$0 {start|stop|restart|reload|force-reload|status}"
+	msg_usage "$0 {start|stop|restart|try-restart|reload|force-reload|status}"
 	exit 3
 esac
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cronie/cronie.init?r1=1.1&r2=1.2&f=u