From 1298d52cbc0d32fdc49add7bfe1f8ddf122bc3f0 Mon Sep 17 00:00:00 2001 From: Jonathan Brassow <jbrassow@redhat.com> Date: Fri, 14 May 2010 15:28:06 -0500 Subject: [PATCH] halvm: Fix bug 506587: lvm agent incorrectly reports vg is in volume_list If the name of the VG controlled by rgmanager is a substring of the name of the node, the HA-LVM script will complain of an improper setup. The fix is to also look for the associated quotes that are necessary when specifying strings in lvm.conf. Thanks to John Ruemker for the patch. --- rgmanager/src/resources/lvm.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/rgmanager/src/resources/lvm.sh b/rgmanager/src/resources/lvm.sh index a972aaf..0ffcadf 100755 --- a/rgmanager/src/resources/lvm.sh +++ b/rgmanager/src/resources/lvm.sh @@ -66,7 +66,7 @@ function ha_lvm_proper_setup_check # lvm.conf:activation/volume_list; otherwise, machines # will be able to activate the VG regardless of the tags ## - if lvm dumpconfig activation/volume_list | grep $OCF_RESKEY_vg_name; then + if lvm dumpconfig activation/volume_list | grep "\"$OCF_RESKEY_vg_name\""; then ocf_log err "HA LVM: Improper setup detected" ocf_log err "- $OCF_RESKEY_vg_name found in \"volume_list\" in lvm.conf" return $OCF_ERR_GENERIC -- 1.7.2.2