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 d8eea12ef802abd0bd8a7338f280cb59115ac61a..8d20f569ac8acfbe4e8b7426301b04a28ca4b765 100644 (file)
--- 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 684f5cd6eb761a34c4f5a2d861a1308ba0c112fb..486d5541fcada73deef6216778dea6a0207b9af7 100644 (file)
--- 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]*)