[PATCH 3/3] Fix _require_scratch test for extN, resierfs, gfs2, and btrfs

["Theodore Ts'o" <tytso@xxxxxxx>]

The extN, reiserfs, gfs2, and btrfs filesysytem types should use the
same check for a block device as XFS and UDF, and not the test for
NFS, which was checking for host:/foo/bar/baz when checking for a
scratch device.

Also, the NFS logic was also incorrect, in that it would allow a
zero-length SCRATCH_DEV to continue.

Signed-off-by: "Theodore Ts'o" <tytso@xxxxxxx>
---
 common.rc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common.rc b/common.rc
index 581cfba..8b9ba7d 100644
--- a/common.rc
+++ b/common.rc
@@ -593,7 +593,7 @@ _supported_os()
 _require_scratch()
 {
     case "$FSTYP" in
-       xfs|udf)
+       xfs|udf|ext2|ext3|ext4|reiserfs|gfs2|btrfs)
                 if [ -z "$SCRATCH_DEV" -o "`_is_block_dev $SCRATCH_DEV`" = "" ]
                 then
                     _notrun "this test requires a valid \$SCRATCH_DEV"
@@ -603,7 +603,7 @@ _require_scratch()
                     _notrun "this test requires a valid \$SCRATCH_DEV"
                 fi
                 ;;
-       nfs*|ext2|ext3|ext4|reiserfs|gfs2|btrfs)
+       nfs*)
                 echo $SCRATCH_DEV | grep -q ":" > /dev/null 2>&1
                 if [ ! -z "$SCRATCH_DEV" -a ! -b "$SCRATCH_DEV" -a "$?" != "0" 
]
                 then
-- 
1.6.3.2.1.gb9f7d.dirty