rpms/anacron/devel anacron.init,1.17,1.18 anacron.spec,1.50,1.51

[Marcela Mašláňová]

Author: mmaslano

Update of /cvs/pkgs/rpms/anacron/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23144

Modified Files:
	anacron.init anacron.spec 
Log Message:
* Wed Jul 30 2008 Marcela Maslanova <mmaslano at redhat.com> 2.3-63
- fix previous patch, thanks to mbroz



Index: anacron.init
===================================================================
RCS file: /cvs/pkgs/rpms/anacron/devel/anacron.init,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- anacron.init	22 Sep 2008 16:07:05 -0000	1.17
+++ anacron.init	22 Sep 2008 16:12:15 -0000	1.18
@@ -8,11 +8,11 @@
 # Source function library.
 . /etc/rc.d/init.d/functions
 
+[ -f /usr/sbin/anacron ] || exit 0
+
 prog="anacron"
-PIDFILE=/var/run/anacron.pid
+PIDFILE=/var/spool/anacron/cron.daily
 LOCKFILE=/var/lock/subsys/$prog
-ANACRON=/usr/sbin/anacron
-
 #
 #  NOTE: anacron exits after it has determined it has no more work to do.
 #        Hence, its initscript cannot do normal lock file management.
@@ -22,7 +22,6 @@
 #
 
 start() {
-    [ -x $ANACRON ] || exit 5
     echo -n $"Starting $prog: " 
     daemon +19 anacron -s
     RETVAL=$?
@@ -35,15 +34,16 @@
 
 stop() {
     echo -n $"Stopping $prog: "
-    # daemon exists only sometime -> hard to kill
-    killproc $ANACRON
-    RETVAL=3
-    # kill first, than ask
-    if [ -n "`pidfileofproc $ANACRON`" ]; then
-	failure $"Stopping $prog"
-	RETVAL=1
+    if [ -f $PIDFILE ]; then
+	killproc anacron
+	RETVAL=$?
+	if [ $RETVAL -ne 0 ]; then 
+	    failure;
+	fi;
+    else
+	failure;
     fi
-    [ "RETVAL" = 0 ] && rm -f $LOCK_FILE
+    [ "$RETVAL" = 0 ] && touch $LOCKFILE
     echo
 }
 
@@ -57,8 +57,7 @@
 	    ;;
 	
 	status)
-		## hard to say - anacron is up only when cron wake him
-		## and has some jobs to do.
+	    ## hard to say - anacron is up only when cron wake him
 	    status $prog
 	    RETVAL=$?
 	    ;;
@@ -83,4 +82,3 @@
 esac
 
 exit $RETVAL
-


Index: anacron.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anacron/devel/anacron.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- anacron.spec	30 Jul 2008 14:09:55 -0000	1.50
+++ anacron.spec	22 Sep 2008 16:12:15 -0000	1.51
@@ -1,7 +1,7 @@
 Summary: A cron-like program that can run jobs lost during downtime
 Name: anacron
 Version: 2.3
-Release: 62%{?dist}
+Release: 63%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://packages.debian.org/stable/source/anacron
@@ -111,6 +111,9 @@
 %dir /etc/cron.monthly/0anacron
 
 %changelog
+* Wed Jul 30 2008 Marcela Maslanova <mmaslano at redhat.com> 2.3-63
+- fix previous patch, thanks to mbroz
+
 * Wed Jul 30 2008 Marcela Maslanova <mmaslano at redhat.com> 2.3-62
 - 441576 really stop anacron daemon