rpms/apcupsd/EL-5 apcupsd-3.14.0-init.patch, NONE, 1.1 apcupsd.spec, 1.15, 1.16 apcupsd-3.10.18-init.patch, 1.1, NONE

[Orion Poplawski (orion)]

Author: orion

Update of /cvs/extras/rpms/apcupsd/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15212/EL-5

Modified Files:
	apcupsd.spec 
Added Files:
	apcupsd-3.14.0-init.patch 
Removed Files:
	apcupsd-3.10.18-init.patch 
Log Message:
Fix init script for LSB compliance (bug #237532)


apcupsd-3.14.0-init.patch:

--- NEW FILE apcupsd-3.14.0-init.patch ---
--- apcupsd-3.14.0/platforms/redhat/apcupsd.in.init	2005-01-09 15:55:41.000000000 -0700
+++ apcupsd-3.14.0/platforms/redhat/apcupsd.in	2007-04-23 12:13:35.000000000 -0600
@@ -3,7 +3,7 @@
 # apcupsd      This shell script takes care of starting and stopping
 #	       the apcupsd UPS monitoring daemon.
 #
-# chkconfig: 2345 60 99
+# chkconfig: - 60 99
 # description: apcupsd monitors power and takes action if necessary
 #
 APCPID=@PIDDIR@/apcupsd.pid
@@ -42,13 +42,24 @@
        rm -f $APCPID
        rm -f @LOCKDIR@/subsys/apcupsd
        ;;
-    restart)
+    restart|force-reload)
        $0 stop
        sleep 15
        $0 start
        ;;
+    reload)
+       echo "$0: reload not implemented"
+       exit 3
+       ;;
     status)
-       @sbindir@/apcaccess status
+       status apcupsd
+       RETVAL=$?
+       if [ $RETVAL -eq 0 ]
+       then
+          @sbindir@/apcaccess status
+       else
+          exit $RETVAL
+       fi
        ;;
     *)
        echo "Usage: $0 {start|stop|restart|status}"


Index: apcupsd.spec
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/EL-5/apcupsd.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- apcupsd.spec	19 Apr 2007 15:35:03 -0000	1.15
+++ apcupsd.spec	23 Apr 2007 20:01:13 -0000	1.16
@@ -1,6 +1,6 @@
 Name:         apcupsd
 Version:      3.14.0
-Release:      2%{?dist}
+Release:      3%{?dist}
 Summary:      APC UPS Power Control Daemon for Linux
 
 Group:        System Environment/Daemons
@@ -167,6 +167,9 @@
 
 
 %changelog
+* Mon Apr 23 2007 - Orion Poplawski <orion at cora.nwra.com> - 3.14.0-3
+- Fix init script for LSB compliance (bug #237532)
+
 * Fri Apr 19 2007 - Orion Poplawski <orion at cora.nwra.com> - 3.14.0-2
 - Rebuild with RHEL5 final
 


--- apcupsd-3.10.18-init.patch DELETED ---