rpms/cluster/devel cman_init_fix-0c80e08741cb.diff, NONE, 1.1 cluster.spec, 1.22, 1.23

[Fabio M. Di Nitto]

Author: fabbione

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

Modified Files:
	cluster.spec 
Added Files:
	cman_init_fix-0c80e08741cb.diff 
Log Message:
Add cman init script fix from upstream


cman_init_fix-0c80e08741cb.diff:

--- NEW FILE cman_init_fix-0c80e08741cb.diff ---
commit 0c80e08741cb0619a2f973b2d0f15d35894b694c
Author: Ryan McCabe <rmccabe at redhat.com>
Date:   Mon Oct 6 17:20:55 2008 -0400

    cman: Fix typo that caused start-up to fail
    
    "/usr/sbin/cman_tool" should be "/sbin/cman_tool"

diff --git a/cman/init.d/cman b/cman/init.d/cman
index f500937..9229584 100644
--- a/cman/init.d/cman
+++ b/cman/init.d/cman
@@ -240,7 +240,7 @@ start_daemons()
 
 start_fence()
 {
-    /usr/sbin/cman_tool status | grep Flags | grep 2node &> /dev/null
+    /sbin/cman_tool status | grep Flags | grep 2node &> /dev/null
     if [ $? -ne 0 ]
     then
         errmsg=$( /sbin/fence_tool -w -t $FENCED_START_TIMEOUT join \


Index: cluster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/cluster.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- cluster.spec	26 Sep 2008 19:10:21 -0000	1.22
+++ cluster.spec	8 Oct 2008 08:37:45 -0000	1.23
@@ -19,11 +19,12 @@
 Name: cluster
 Summary: Red Hat Cluster
 Version: 2.99.10
-Release: 5%{?alphatag:.%{alphatag}}%{?dist}
+Release: 6%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
 Source0: ftp://sources.redhat.com/pub/cluster/releases/cluster-%{version}.tar.gz
+Patch0: cman_init_fix-0c80e08741cb.diff
 
 ## Setup/build bits
 
@@ -48,6 +49,7 @@
 
 %prep
 %setup -q -n cluster-%{version}
+%patch0 -p 1
 
 %build
 # for legacy reasons, all binaries have always been installed in /sbin
@@ -337,6 +339,9 @@
 %{_mandir}/man8/gnbd*
 
 %changelog
+* Wed Oct  8 2008 Fabio M. Di Nitto <fdinitto at redhat.com> - 2.99.10-6
+- cman init: add fix from upstream for cman_tool wrong path.
+
 * Fri Sep 26 2008 Fabio M. Di Nitto <fdinitto at redhat.com> - 2.99.10-5
 - cman now Requires: ricci and modcluster.