rpms/anacron/devel anacron.init,1.15,1.16 anacron.spec,1.49,1.50

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

Author: mmaslano

Update of /cvs/pkgs/rpms/anacron/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19240

Modified Files:
	anacron.init anacron.spec 
Log Message:
* Wed Jul 30 2008 Marcela Maslanova <mmaslano at redhat.com> 2.3-62
- 441576 really stop anacron daemon



Index: anacron.init
===================================================================
RCS file: /cvs/pkgs/rpms/anacron/devel/anacron.init,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- anacron.init	28 May 2008 14:06:40 -0000	1.15
+++ anacron.init	30 Jul 2008 14:09:55 -0000	1.16
@@ -11,6 +11,8 @@
 prog="anacron"
 PIDFILE=/var/run/anacron.pid
 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.
@@ -20,7 +22,7 @@
 #
 
 start() {
-    [ -x /usr/sbin/anacron ] || exit 5
+    [ -x $ANACRON ] || exit 5
     echo -n $"Starting $prog: " 
     daemon +19 anacron -s
     RETVAL=$?
@@ -32,15 +34,15 @@
 
 stop() {
     echo -n $"Stopping $prog: "
-    if [ -f $PIDFILE ]; then
-	killproc anacron
-	RETVAL=$?
-	if [ $RETVAL -ne 0 ]; then 
-	    failure;
-	fi;
-    else
-	failure;
+    # 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
     fi
+    [ "RETVAL" = 0 ] && rm -f $LOCK_FILE
     echo
 }
 


Index: anacron.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anacron/devel/anacron.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- anacron.spec	30 May 2008 12:45:31 -0000	1.49
+++ anacron.spec	30 Jul 2008 14:09:55 -0000	1.50
@@ -1,7 +1,7 @@
 Summary: A cron-like program that can run jobs lost during downtime
 Name: anacron
 Version: 2.3
-Release: 61%{?dist}
+Release: 62%{?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-62
+- 441576 really stop anacron daemon
+
 * Wed May 28 2008 Marcela Maslanova <mmaslano at redhat.com> 2.3-61
 - cleaning lots of scripts in anacron & crontabs