From: Zdenek Kabelac <zkabelac@redhat.com>
Date: Mon, 19 Sep 2011 14:52:33 +0000 (+0000)
Subject: Add support for non /dev devices
X-Git-Tag: v2_02_91~530
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=13e3c25ade3e6af289d9e9bfa58a3925ecc38ffb;p=lvm2.git

Add support for non /dev devices

Since test suite is not using /dev - add support for such dirs into fsadm.
---

diff --git a/WHATS_NEW b/WHATS_NEW
index d8eea12ef..8d20f569a 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.89 - 
 ==================================
+  Add support for non /dev device paths into fsadm script.
   Support different PATH setting for fsadm script testing.
   Surround all executed commands with quotes in fsadm script.
   Fix missing '$' in test for content of "$LVM" in fsadm script.
diff --git a/scripts/fsadm.sh b/scripts/fsadm.sh
index 684f5cd6e..486d5541f 100644
--- a/scripts/fsadm.sh
+++ b/scripts/fsadm.sh
@@ -177,7 +177,7 @@ decode_size() {
 detect_fs() {
 	VOLUME_ORIG=$1
 	VOLUME=${1#/dev/}
-	VOLUME=$("$READLINK" $READLINK_E "/dev/$VOLUME") || error "Cannot get readlink $1"
+	VOLUME=$("$READLINK" $READLINK_E "/dev/$VOLUME") || VOLUME=$("$READLINK" $READLINK_E "$VOLUME_ORIG") || error "Cannot get readlink \"$1\""
 	RVOLUME=$VOLUME
 	case "$RVOLUME" in
 	  /dev/dm-[0-9]*)