From: Barry Naujok <bnaujok@sgi.com>
Date: Wed, 26 Nov 2008 02:43:44 +0000 (+0000)
Subject: mkfe2fs unfortunately hasn't heard about real enterprise setups using
X-Git-Tag: v1.1.0~344
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a87c927524b32236a8f00e6ac386a635c67f1a25;p=xfstests-dev.git

mkfe2fs unfortunately hasn't heard about real enterprise setups using
whole disks and needs the -F option to create a filesystem on those
without asking stupid questions that make the testcases block forever.


Signed-off-by: Christoph Hellwig <hch@lst.de>
Merge of master-melb:xfs-cmds:32546a by kenmcd.

  fix xfsqa on whole disks
---

diff --git a/032 b/032
index 97dd6223..840b32d4 100755
--- a/032
+++ b/032
@@ -48,6 +48,10 @@ do
 	[ $fs = reiserfs ] && preop="echo y |" && preargs="-f"
 	# cramfs mkfs requires a directory argument
 	[ $fs = cramfs ] && preargs=/proc/fs/xfs
+	[ $fs = ext2 ] && preargs="-F"
+	[ $fs = ext3 ] && preargs="-F"
+	[ $fs = ext4 ] && preargs="-F"
+	[ $fs = ext4dev ] && preargs="-F"
 
 	# overwite the first few Kb - should blow away superblocks
 	src/devzero -n 20 $SCRATCH_DEV >/dev/null
diff --git a/049 b/049
index 6f1545fd..5bf430bf 100755
--- a/049
+++ b/049
@@ -60,7 +60,7 @@ echo "--- mounts" >> $seq.full
 mount >> $seq.full
 
 _log "Create ext2 fs on scratch"
-mkfs -t ext2 $SCRATCH_DEV >> $seq.full 2>&1 \
+mkfs -t ext2 -F $SCRATCH_DEV >> $seq.full 2>&1 \
     || _fail "!!! failed to mkfs ext2"
 
 _log "Mount ext2 fs on scratch"