rpms/ipmitool/F-12 ipmitool-1.8.10-ipmievd-condrestart.patch, NONE, 1.1 ipmitool.spec, 1.6, 1.7

[Jan Šafránek]

Author: jsafrane

Update of /cvs/pkgs/rpms/ipmitool/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27559

Modified Files:
	ipmitool.spec 
Added Files:
	ipmitool-1.8.10-ipmievd-condrestart.patch 
Log Message:
fix ipmievd initscript 'condrestart' action
Resolves: #532188

ipmitool-1.8.10-ipmievd-condrestart.patch:
 ipmievd.init.redhat |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

--- NEW FILE ipmitool-1.8.10-ipmievd-condrestart.patch ---
532188 -  ipmievd init script's condrestart doesn't work

Author: Ville Skyttä (ville.skytta at iki.fi)
Sent upstream as https://sourceforge.net/tracker/?func=detail&aid=2889888&group_id=95200&atid=610552

Index: contrib/ipmievd.init.redhat
===================================================================
RCS file: /cvsroot/ipmitool/ipmitool/contrib/ipmievd.init.redhat,v
retrieving revision 1.1
diff -u -r1.1 ipmievd.init.redhat
--- contrib/ipmievd.init.redhat	19 Mar 2006 23:05:48 -0000	1.1
+++ contrib/ipmievd.init.redhat	31 Oct 2009 08:50:07 -0000
@@ -62,6 +62,11 @@
 	return $ret
 }
 
+restart() {
+	stop
+	start
+}
+
 case "$1" in
     start)
 	start
@@ -72,11 +77,10 @@
     status)
 	status $IPMIEVD_BIN
 	;;
-    restart|reload)
-    	stop
-	start
+    restart|reload|force-reload)
+	restart
 	;;
-    condrestart)
+    try-restart|condrestart)
 	[ -f /var/lock/subsys/ipmievd ] && restart || :
 	;;
     *)


Index: ipmitool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ipmitool/F-12/ipmitool.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- ipmitool.spec	21 Aug 2009 13:58:22 -0000	1.6
+++ ipmitool.spec	2 Nov 2009 12:51:40 -0000	1.7
@@ -1,7 +1,7 @@
 Name:         ipmitool
 Summary:      Utility for IPMI control
 Version:      1.8.11
-Release:      3%{?dist}
+Release:      4%{?dist}
 License:      BSD
 Group:        System Environment/Base
 URL:          http://ipmitool.sourceforge.net/
@@ -15,6 +15,7 @@ Obsoletes: OpenIPMI-tools < 2.0.14-3
 Provides: OpenIPMI-tools = 2.0.14-3
 
 Patch1: ipmitool-1.8.10-ipmievd-init.patch
+Patch2: ipmitool-1.8.10-ipmievd-condrestart.patch
 
 %description
 This package contains a utility for interfacing with devices that support
@@ -35,6 +36,7 @@ setting LAN configuration, and chassis p
 
 %setup -q
 %patch1 -p1 -b .ipmievd-init
+%patch2 -p0 -b .condrestart
 
 for f in AUTHORS ChangeLog; do
     iconv -f iso-8859-1 -t utf8 < ${f} > ${f}.utf8
@@ -85,6 +87,9 @@ fi
 
 
 %changelog
+* Mon Nov  2 2009 Jan Safranek  <jsafrane at redhat.com> 1.8.11-4
+- fix ipmievd initscript 'condrestart' action (#532188)
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.8.11-3
 - rebuilt with new openssl