diff -Nru resource-agents-3.9.2/debian/changelog resource-agents-3.9.2/debian/changelog --- resource-agents-3.9.2/debian/changelog 2012-04-16 23:37:44.000000000 +0200 +++ resource-agents-3.9.2/debian/changelog 2012-04-26 18:26:26.000000000 +0200 @@ -1,3 +1,14 @@ +resource-agents (1:3.9.2-5ubuntu4.1) precise-proposed; urgency=low + + * debian/patches/vgchange-monitor.patch: + - apply two upstream commits: + + 02c72cf9 + + 9dd12940 + - activating clustered VGs requires enabled monitoring + - (LP: #988984) + + -- Ante Karamatic Thu, 26 Apr 2012 09:06:57 +0200 + resource-agents (1:3.9.2-5ubuntu4) precise; urgency=low * debian/control: Use correct version for Conflicts/Replaces to not fail diff -Nru resource-agents-3.9.2/debian/patches/series resource-agents-3.9.2/debian/patches/series --- resource-agents-3.9.2/debian/patches/series 2012-04-02 19:35:12.000000000 +0200 +++ resource-agents-3.9.2/debian/patches/series 2012-04-26 18:14:56.000000000 +0200 @@ -3,3 +3,4 @@ CVE-2010-3389--bug598549.patch mysql-path.patch pgsql-fix_bashism.patch +vgchange-monitor.patch diff -Nru resource-agents-3.9.2/debian/patches/vgchange-monitor.patch resource-agents-3.9.2/debian/patches/vgchange-monitor.patch --- resource-agents-3.9.2/debian/patches/vgchange-monitor.patch 1970-01-01 01:00:00.000000000 +0100 +++ resource-agents-3.9.2/debian/patches/vgchange-monitor.patch 2012-04-26 18:14:56.000000000 +0200 @@ -0,0 +1,36 @@ +Index: resource-agents-3.9.2/heartbeat/LVM +=================================================================== +--- resource-agents-3.9.2.orig/heartbeat/LVM 2012-04-26 09:03:39.000000000 +0200 ++++ resource-agents-3.9.2/heartbeat/LVM 2012-04-26 09:05:38.000000000 +0200 +@@ -194,6 +194,8 @@ + # Enable LVM volume + # + LVM_start() { ++ local vgchange_options ++ local active_mode + + # TODO: This MUST run vgimport as well + +@@ -209,12 +211,19 @@ + if ocf_is_true "$OCF_RESKEY_exclusive" ; then + active_mode="ey" + fi +- partial_active="" ++ vgchange_options="-a $active_mode" ++ + if ocf_is_true "$OCF_RESKEY_partial_activation" ; then +- partial_active="--partial" ++ vgchange_options="$vgchange_options --partial" ++ fi ++ ++ # for clones (clustered volume groups), we'll also have to force ++ # monitoring, even if disabled in lvm.conf. ++ if ocf_is_clone; then ++ vgchange_options="$vgchange_options --monitor y" + fi + +- ocf_run vgchange -a $active_mode $partial_active $1 || return $OCF_ERR_GENERIC ++ ocf_run vgchange $vgchange_options $1 || return $OCF_ERR_GENERIC + + if LVM_status $1; then + : OK Volume $1 activated just fine!