rpms/vixie-cron/devel vixie-cron.init, 1.4, 1.5 vixie-cron.spec, 1.99, 1.100

[Marcela Mašláňová (mmaslano)]

Author: mmaslano

Update of /cvs/pkgs/rpms/vixie-cron/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26515

Modified Files:
	vixie-cron.init vixie-cron.spec 
Log Message:
Add init script.



Index: vixie-cron.init
===================================================================
RCS file: /cvs/pkgs/rpms/vixie-cron/devel/vixie-cron.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vixie-cron.init	25 Feb 2005 18:41:15 -0000	1.4
+++ vixie-cron.init	12 Jul 2007 12:20:05 -0000	1.5
@@ -11,63 +11,54 @@
 # config: /etc/crontab
 # pidfile: /var/run/crond.pid
 
+RETVAL=0
+prog="crond"
+CROND=/usr/sbin/crond
+LOCK_FILE=/var/lock/subsys/crond
+
 # Source function library.
 . /etc/init.d/functions
-. /etc/sysconfig/crond
+
+# set sysconfig settings
+[ -f /etc/sysconfig/crond ] && . /etc/sysconfig/crond
+
+[ -f /etc/sysconfig/crond ] || exit 6
+
+# validate mail
 t=${CRON_VALIDATE_MAILRCPTS:-UNSET}
 [ "$t" != "UNSET" ] && export CRON_VALIDATE_MAILRCPTS="$t"
  
-# See how we were called.
-  
 prog="crond"
 
 start() {
-	echo -n $"Starting $prog: "	
-        if [ -e /var/lock/subsys/crond ]; then
-	    if [ -e /var/run/crond.pid ] && [ -e /proc/`cat /var/run/crond.pid` ]; then
-		echo -n $"cannot start crond: crond is already running.";
-		failure $"cannot start crond: crond already running.";
-		echo
-		return 1
-	    fi
-	fi
-	daemon crond $CRONDARGS
+	echo -n $"Starting $prog: "
+	daemon $CROND $OPTIONS && success || failure
 	RETVAL=$?
+	[ "$RETVAL" = 0 ] && touch $LOCK_FILE
 	echo
-	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/crond;
-	return $RETVAL
 }
 
 stop() {
 	echo -n $"Stopping $prog: "
-        if [ ! -e /var/lock/subsys/crond ]; then
-	    echo -n $"cannot stop crond: crond is not running."
-	    failure $"cannot stop crond: crond is not running."
-	    echo
-	    return 1;
+	if [ -n "`pidfileofproc $CROND`" ]; then
+		killproc $CROND
+	else
+		failure $"Stopping $prog"
 	fi
-	killproc crond
 	RETVAL=$?
+	[ "$RETVAL" = 0 ] && rm -f $LOCK_FILE
 	echo
-        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/crond;
-	return $RETVAL
-}	
-
-rhstatus() {
-	status crond
-}	
-
-restart() {
-  	stop
-	start
 }	
 
 reload() {
-	echo -n $"Reloading cron daemon configuration: "
-	killproc crond -HUP
+	echo -n $"Reloading $prog: "
+	if [ -n "`pidfileofproc $CROND`" ]; then
+		killproc $CROND -HUP
+	else
+		failure $"Reloading $prog"
+	fi
 	RETVAL=$?
 	echo
-	return $RETVAL
 }	
 
 case "$1" in
@@ -78,18 +69,27 @@
   	stop
 	;;
   restart)
-  	restart
+	stop
+  	start
 	;;
   reload)
   	reload
 	;;
   status)
-  	rhstatus
+	status $CROND
 	;;
   condrestart)
-  	[ -f /var/lock/subsys/crond ] && restart || :
-	;;
+    if [ -f  $LOCK_FILE ]; then
+        if [ "$RETVAL" = 0 ]; then
+            stop
+            sleep 3
+            start
+        fi
+    fi
+    ;;
   *)
 	echo $"Usage: $0 {start|stop|status|reload|restart|condrestart}"
-	exit 1
+	RETVAL=3
 esac
+exit $RETVAL
+


Index: vixie-cron.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vixie-cron/devel/vixie-cron.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- vixie-cron.spec	2 Jul 2007 11:02:23 -0000	1.99
+++ vixie-cron.spec	12 Jul 2007 12:20:05 -0000	1.100
@@ -10,7 +10,7 @@
 Summary: The Vixie cron daemon for executing specified programs at set times
 Name: vixie-cron
 Version: 4.1
-Release: 83%{?dist}
+Release: 84%{?dist}
 Epoch: 4
 License: BSD
 Group: System Environment/Base
@@ -270,6 +270,10 @@
 %config(noreplace) /etc/sysconfig/crond
 
 %changelog
+* Wed Jul 11 2007 Marcela Maslanova <mmaslano at redhat.com> - 4:4.1-84
+- fix init script
+- Resolves: rhbz#247091
+
 * Mon Jul  2 2007 Marcela Maslanova <mmaslano at redhat.com> - 4:4.1-83
 - fix 246396, tmp directory, typo in crontab.1
 - Resolves: rhbz#246396