[linux-lvm] [PATCH 23/35] fsadm: Only use readlink if link is provided
Lukas Czerner
lczerner at redhat.com
Wed Sep 21 16:45:42 UTC 2011
Signed-off-by: Lukas Czerner <lczerner at redhat.com>
---
scripts/fsadm.sh | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/scripts/fsadm.sh b/scripts/fsadm.sh
index 63600eb..3a00063 100755
--- a/scripts/fsadm.sh
+++ b/scripts/fsadm.sh
@@ -295,8 +295,10 @@ decode_size() {
# dereference device name if it is symbolic link
detect_fs() {
VOLUME_ORIG=$1
- VOLUME=${1/#"${DM_DEV_DIR}/"/}
- VOLUME=$("$READLINK" $READLINK_E "$DM_DEV_DIR/$VOLUME") || error "Cannot get readlink \"$1\""
+ VOLUME=${DM_DEV_DIR}/${1/#"${DM_DEV_DIR}/"/}
+ if [ -h "$VOLUME" ]; then
+ VOLUME=$("$READLINK" $READLINK_E "$VOLUME") || error "Cannot get readlink \"$VOLUME\""
+ fi
RVOLUME=$VOLUME
case "$RVOLUME" in
# hardcoded /dev since udev does not create these entries elsewhere
--
1.7.4.4
More information about the linux-lvm
mailing list