[Debian-ha-maintainers] Could you *please* hold on for a short second?

[Guido Günther]

Hi Ante,
I'm cc:'ing debian-ha, since it makes sense to have more peer review.

On Thu, Jul 16, 2009 at 12:16:42PM +0200, Ante Karamatić wrote:
> Hi all!
> 
> Guido Günther wrote:
> 
> > Git is here:
> > 	http://git.debian.org/?p=debian-ha/corosync.git;a=summary
> 
> I'm attaching a git diff. It addes patch recently introduced upstream
> which enables support for pacemaker.
Nice.

> I've also fixed installation of corosync.conf. We should reconsider
> installing /etc/corosync/corosync.conf.example. It's smart to include
> it, but it belongs in /usr/share/doc/corosync/examples, not in
> /etc/corosync/.
Yes, I like that much more and that's how I did it in openais.

> We'll need to add better init script. Upstream's init/generic isn't
> flawless, but the one we ship isn't good either - it doesn't stop
> corosync's services.
Martin had a reworked script in his package. Could you check if it fits
your needs, we could then simply move it over.

If Martin has no objection's I'll apply the patch as is.
Cheers,
 -- Guido

> diff --git a/debian/patches/0002-fix-corodefs b/debian/patches/0002-fix-corodefs
> new file mode 100644
> index 0000000..e27152f
> --- /dev/null
> +++ b/debian/patches/0002-fix-corodefs
> @@ -0,0 +1,13 @@
> +Index: corosync/include/corosync/corodefs.h
> +===================================================================
> +--- corosync.orig/include/corosync/corodefs.h	2009-07-16 07:33:59.000000000 +0200
> ++++ corosync/include/corosync/corodefs.h	2009-07-16 07:34:18.000000000 +0200
> +@@ -50,7 +50,7 @@
> + 	CFG_SERVICE = 7,
> + 	CPG_SERVICE = 8,
> + 	CMAN_SERVICE = 9,
> +-	CRM_SERVICE = 10,
> ++	PCMK_SERVICE = 10,
> + 	CONFDB_SERVICE = 11,
> + 	QUORUM_SERVICE = 12,
> + 	PLOAD_SERVICE = 13,
> diff --git a/debian/patches/series b/debian/patches/series
> index 4da9180..d8e659a 100644
> --- a/debian/patches/series
> +++ b/debian/patches/series
> @@ -1 +1,2 @@
>  0001-add-missing-NAME-entry-for-whatis.patch
> +0002-fix-corodefs
> diff --git a/debian/rules b/debian/rules
> index 74c07aa..73043e0 100755
> --- a/debian/rules
> +++ b/debian/rules
> @@ -53,7 +53,7 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
>  	strip --remove-section=.comment --remove-section=.note --strip-unneeded debian/corosync/usr/lib/corosync/lcrso/*
>  endif
>  	# install example configuration file
> -	cp -ax $(CURDIR)/debian/corosync.example-config $(CURDIR)/debian/tmp/etc/corosync/corosync.conf
> +	cp -ax $(CURDIR)/debian/corosync.example-config $(CURDIR)/debian/corosync/etc/corosync/corosync.conf
>  	dh_compress
>  	chmod 644 debian/corosync/usr/lib/corosync/lcrso/*.lcrso
>  	dh_fixperms