[Debian-ha-svn-commits] [SCM] corosync Debian packaging branch, master, updated. debian/1.3.0-2-4-gec94d30

[Guido Günther]

The following commit has been merged in the master branch:
commit ec94d30109c06ea5cba640a7fe3339b212dc809d
Author: Andres Rodriguez <andreserl at ubuntu.com>
Date:   Mon May 23 12:17:52 2011 -0400

    Ensure that '/var/run/resource-agents' is created
    
    When the cluster resources are started, the Resource Agents expect '/var/run/resource-agents/'
    to exists. However, the RA's nor any other piece of software creates the directory. This has
    been discussed upstream and it was recommended [1] to verify/create such directory on the init
    scripts (corosync/heartbeat/pacemaker mcp)
    
    [1]: http://developerbugs.linux-foundation.org/show_bug.cgi?id=2378#c17
    
    LP: #787062
    Closes: #627685

diff --git a/debian/corosync.init b/debian/corosync.init
index 67087de..9fab7ca 100644
--- a/debian/corosync.init
+++ b/debian/corosync.init
@@ -20,6 +20,7 @@ DAEMON_ARGS=""
 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 @@ PIDFILE=/var/run/corosync.pid
 # 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

-- 
corosync Debian packaging