rpms/cman/F-9 fix-init.diff,NONE,1.1 cman.spec,1.108,1.109

[Fabio M. Di Nitto]

Author: fabbione

Update of /cvs/pkgs/rpms/cman/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15176

Modified Files:
	cman.spec 
Added Files:
	fix-init.diff 
Log Message:
Fix cman init script


fix-init.diff:

--- NEW FILE fix-init.diff ---
commit 04b532e83dd7fef23daf1ba89677a09c18fbca49
Author: Fabio M. Di Nitto <fdinitto at redhat.com>
Date:   Fri Sep 19 11:38:54 2008 +0200

    cman: fix broken init script
    
    remove merge/cherry-pick leftovers from
    55ea74998e36f6f43380fdd3a8a15943b1123792
    
    fix BZ #461004
    
    Signed-off-by: Fabio M. Di Nitto <fdinitto at redhat.com>

diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in
index b2106d3..8594675 100644
--- a/cman/init.d/cman.in
+++ b/cman/init.d/cman.in
@@ -276,7 +276,6 @@ fence_xvmd_enabled()
     return 0
 }
 
-<<<<<<< HEAD:cman/init.d/cman.in
 set_networking_params()
 {
     if [ ! -f  /proc/sys/net/core/rmem_default ]


Index: cman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cman/F-9/cman.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- cman.spec	14 Aug 2008 12:17:30 -0000	1.108
+++ cman.spec	23 Sep 2008 05:00:46 -0000	1.109
@@ -19,13 +19,14 @@
 Name: cman
 Summary: CMAN - The Cluster Manager
 Version: 2.03.07
-Release: 1%{?alphatag:.%{alphatag}}%{?dist}
+Release: 2%{?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: kernel-2.6.25.diff
 Patch1: userland-2.6.26.diff
+Patch2: fix-init.diff
 
 Requires(post): chkconfig
 Requires(preun): initscripts
@@ -57,6 +58,7 @@
 %setup -q -n cluster-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 # for legacy reasons, all binaries have always been installed in /sbin
@@ -167,6 +169,9 @@
 CMAN - The Cluster Manager development package
 
 %changelog
+* Tue Sep 23 2008 Fabio M. Di Nitto <fdinitto at redhat.com> - 2.03.07-2
+- Fix cman init script. BZ #461004
+
 * Thu Aug 14 2008 Fabio M. Di Nitto <fdinitto at redhat.com> - 2.03.07-1
 - New upstream release
 - Fix rgmanager startup locking issues