diff -Nru corosync-1.3.0/debian/changelog corosync-1.3.0/debian/changelog --- corosync-1.3.0/debian/changelog 2011-05-02 15:45:38.000000000 -0400 +++ corosync-1.3.0/debian/changelog 2011-05-23 11:56:45.000000000 -0400 @@ -1,3 +1,11 @@ +corosync (1.3.0-3ubuntu1) oneiric; urgency=low + + * Resync from debian unstable (LP: #787062). + * debian/corosync.init: Ensure that '/var/run/resource-agents' is created; + otherwise cluster operations will fail as RA's expect it (LP: #751344). + + -- Andres Rodriguez Mon, 23 May 2011 11:56:35 -0400 + corosync (1.3.0-3) unstable; urgency=low * [b763c6a] New patch 0001-Define-semun-on-KFreeBSD.patch diff -Nru corosync-1.3.0/debian/control corosync-1.3.0/debian/control --- corosync-1.3.0/debian/control 2011-05-02 15:39:52.000000000 -0400 +++ corosync-1.3.0/debian/control 2011-05-23 11:45:49.000000000 -0400 @@ -1,7 +1,8 @@ Source: corosync Section: admin Priority: optional -Maintainer: Debian HA Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian HA Maintainers Uploaders: Martin Gerhard Loschwitz , Guido Günther Standards-Version: 3.9.1 Build-Depends: debhelper (>> 5), libnss3-dev, pkg-config, groff diff -Nru corosync-1.3.0/debian/corosync.init corosync-1.3.0/debian/corosync.init --- corosync-1.3.0/debian/corosync.init 2011-03-29 12:26:34.000000000 -0400 +++ corosync-1.3.0/debian/corosync.init 2011-05-23 11:45:49.000000000 -0400 @@ -20,6 +20,7 @@ PIDFILE=/var/run/$NAME.pid SCRIPTNAME=/etc/init.d/$NAME PIDFILE=/var/run/corosync.pid +RARUNDIR=/var/run/resource-agents # Exit if the package is not installed [ -x "$DAEMON" ] || exit 0 @@ -27,6 +28,9 @@ # Read configuration variable file if it is present [ -r /etc/default/corosync ] && . /etc/default/corosync +# Make sure the Resource Agents run dir exists. Otherwise create it. +[ -d "$RARUNDIR" ] || mkdir -p $RARUNDIR + if [ "$START" != "yes" ]; then exit 0 fi