From mboxrd@z Thu Jan 1 00:00:00 1970 From: Fabio M. Di Nitto Date: Tue, 15 Mar 2011 09:57:50 +0100 Subject: [Cluster-devel] [PATCH] fs-lib: fix do_monitor device mapping Message-ID: <1300179470-16651-1-git-send-email-fdinitto@redhat.com> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit do_monitor needs to expand _device key to the real device before performing checks Resolves: rhbz#669832 Signed-off-by: Fabio M. Di Nitto --- rgmanager/src/resources/utils/fs-lib.sh | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/rgmanager/src/resources/utils/fs-lib.sh b/rgmanager/src/resources/utils/fs-lib.sh index 4f242f7..7b933f8 100644 --- a/rgmanager/src/resources/utils/fs-lib.sh +++ b/rgmanager/src/resources/utils/fs-lib.sh @@ -866,7 +866,18 @@ do_stop() { do_monitor() { - is_mounted "${OCF_RESKEY_device}" "${OCF_RESKEY_mountpoint}" + # + # Get the device + # + real_device "$OCF_RESKEY_device" + dev="$REAL_DEVICE" + if [ -z "$dev" ]; then + ocf_log err "\ +start_filesystem: Could not match $OCF_RESKEY_device with a real device" + return $OCF_ERR_ARGS + fi + + is_mounted "$dev" "${OCF_RESKEY_mountpoint}" if [ $? -ne $YES ]; then ocf_log err "${OCF_RESOURCE_INSTANCE}: ${OCF_RESKEY_device} is not mounted on ${OCF_RESKEY_mountpoint}" -- 1.7.4