rpms/ocfs2-tools/devel o2cb_pcmk.diff, 1.1, 1.2 ocfs2-tools.spec, 1.11, 1.12

[Fabio M. Di Nitto]

Author: fabbione

Update of /cvs/pkgs/rpms/ocfs2-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26491

Modified Files:
	o2cb_pcmk.diff ocfs2-tools.spec 
Log Message:
Fix pcmk resource agent


o2cb_pcmk.diff:
 o2cb.ocf |  456 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 456 insertions(+)

Index: o2cb_pcmk.diff
===================================================================
RCS file: /cvs/pkgs/rpms/ocfs2-tools/devel/o2cb_pcmk.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- o2cb_pcmk.diff	15 Sep 2009 07:08:40 -0000	1.1
+++ o2cb_pcmk.diff	21 Sep 2009 07:56:02 -0000	1.2
@@ -131,7 +131,7 @@ diff -Nuard ocfs2-tools-1.4.2.orig/vendo
 +
 +status_daemon()
 +{
-+    PID=`pidofproc "$DAEMON"`
++    PID=`pidof "$DAEMON"`
 +    if [ -n "$PID" ]; then
 +	return $OCF_SUCCESS
 +    fi
@@ -145,7 +145,7 @@ diff -Nuard ocfs2-tools-1.4.2.orig/vendo
 +	return $OCF_ERR_INSTALLED
 +    fi
 +
-+    start_daemon "$DAEMON"; rc=$?
++     "$DAEMON"; rc=$?
 +    if [ $rc != 0 ]; then
 +	ocf_log err "Could not start $DAEMON"
 +	return $OCF_ERR_GENERIC


Index: ocfs2-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocfs2-tools/devel/ocfs2-tools.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- ocfs2-tools.spec	15 Sep 2009 07:08:41 -0000	1.11
+++ ocfs2-tools.spec	21 Sep 2009 07:56:03 -0000	1.12
@@ -6,7 +6,7 @@
 Summary: Tools for managing the Ocfs2 cluster file system
 Name: ocfs2-tools
 Version: 1.4.2
-Release: 4%{?alphatag:.%{alphatag}}%{?dist}
+Release: 5%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2
 Group: System Environment/Base
 # The source for this package was pulled from upstream's git repo and manually
@@ -212,6 +212,9 @@ fi
 /usr/lib/ocf/resource.d/ocfs2
 
 %changelog
+* Mon Sep 21 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.4.2-5
+- Fix pcmk resource agent.
+
 * Tue Sep 15 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.4.2-4
 - Add pcmk resource agent.