diff options
| author | NeilBrown <neilb@suse.de> | 2015-07-22 09:58:41 +1000 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2015-07-22 09:58:41 +1000 |
| commit | d51e39c0a42c799088b39d16ede01f95345d7675 (patch) | |
| tree | 386f2c16a406c3fd6bc013025f36625924c86249 | |
| parent | 49325eac3ad6c0ebaa4286365de0d40660f9bba3 (diff) | |
| download | mdadm-d51e39c0a42c799088b39d16ede01f95345d7675.tar.gz | |
test: add -F flag to mkfs
newer versions of mkfs.extX ask before creating a filesystem
on a device which appears to already have a filesystem.
We don't want that, so add the -F flag.
Also be explicit about fs type as one shouldn't depend on defaults.
Signed-off-by: NeilBrown <neilb@suse.com>
| -rwxr-xr-x | test | 2 | ||||
| -rw-r--r-- | tests/10ddf-fail-readd | 2 | ||||
| -rw-r--r-- | tests/10ddf-fail-stop-readd | 4 | ||||
| -rw-r--r-- | tests/10ddf-incremental-wrong-order | 4 |
4 files changed, 6 insertions, 6 deletions
@@ -256,7 +256,7 @@ testdev() { dvsize=$3 chunk=$4 if [ -z "$5" ]; then - mkfs -j $dev > /dev/null 2>&1 && fsck -fn $dev >&2 + mkfs.ext3 -F -j $dev > /dev/null 2>&1 && fsck -fn $dev >&2 fi dsize=$[dvsize/chunk] dsize=$[dsize*chunk] diff --git a/tests/10ddf-fail-readd b/tests/10ddf-fail-readd index 411d35b..9cd7893 100644 --- a/tests/10ddf-fail-readd +++ b/tests/10ddf-fail-readd @@ -10,7 +10,7 @@ mdadm -CR $container -e ddf -l container -n 2 $dev8 $dev9 mdadm -CR $member0 -l raid1 -n 2 $container #$dir/mdadm -CR $member0 -l raid1 -n 2 $container >/tmp/mdmon.txt 2>&1 -mke2fs $member0 +mke2fs -F $member0 check wait set -- $(get_raiddisks $member0) diff --git a/tests/10ddf-fail-stop-readd b/tests/10ddf-fail-stop-readd index 34aeaf5..f8ebe17 100644 --- a/tests/10ddf-fail-stop-readd +++ b/tests/10ddf-fail-stop-readd @@ -11,7 +11,7 @@ mdadm -CR $member0 -l raid1 -n 2 $container #$dir/mdadm -CR $member0 -l raid1 -n 2 $container >/tmp/mdmon.txt 2>&1 # Write to the array -mke2fs $member0 +mke2fs -F $member0 check wait set -- $(get_raiddisks $member0) @@ -33,7 +33,7 @@ mdadm -I $good0 mdadm -IRs || true # Write to the array -mke2fs $member0 +mke2fs -F $member0 # We re-add the disk now mdadm $container --add $fail0 diff --git a/tests/10ddf-incremental-wrong-order b/tests/10ddf-incremental-wrong-order index 1c088c1..9ecf6bc 100644 --- a/tests/10ddf-incremental-wrong-order +++ b/tests/10ddf-incremental-wrong-order @@ -17,8 +17,8 @@ mdadm -CR $member0 -n 2 -l 1 $dev8 $dev9 -z 10000 mdadm --wait $member0 || true mdadm --wait $member1 || true -mke2fs $member0 -mke2fs $member1 +mke2fs -F $member0 +mke2fs -F $member1 sha_0a=$(sha1_sum $member0) sha_1a=$(sha1_sum $member1) |