tests: migrate from ext3 to ext2

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/tests/ts/fsck/ismounted b/tests/ts/fsck/ismounted
index e355b6e9d8c6a030cca7c08ac6cfac90c525473b..ffe1a1d7034b6d6e3cb829feeac20c8e1bb707b8 100755 (executable)
--- a/tests/ts/fsck/ismounted
+++ b/tests/ts/fsck/ismounted
@@ -26,16 +26,16 @@ ts_check_test_command "$TS_HELPER_ISMOUNTED"
 
 ts_skip_nonroot
 ts_check_losetup
-ts_check_prog "mkfs.ext3"
+ts_check_prog "mkfs.ext2"
 
 > $TS_OUTPUT
 
 ts_device_init
 DEVICE=$TS_LODEV
 
-mkfs.ext3 $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE"
+mkfs.ext2 $DEVICE &> /dev/null || ts_die "Cannot make ext2 on $DEVICE"
 
-ts_device_has "TYPE" "ext3" $DEVICE || ts_die "Cannot find ext3 on $DEVICE"
+ts_device_has "TYPE" "ext2" $DEVICE || ts_die "Cannot find ext2 on $DEVICE"
 
 [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
 

diff --git a/tests/ts/libmount/context b/tests/ts/libmount/context
index babeec98f07daaf73f14574a4c272be4e1819e8e..70c779cdf636b6ad06ce20ed29b23bd46efc6ae5 100755 (executable)
--- a/tests/ts/libmount/context
+++ b/tests/ts/libmount/context
@@ -15,7 +15,7 @@ ts_check_test_command "$TS_CMD_UMOUNT"
 ts_check_test_command "$TS_CMD_UUIDGEN"
 
 ts_skip_nonroot
-ts_check_prog "mkfs.ext3"
+ts_check_prog "mkfs.ext2"
 ts_check_prog "mkfs.ext4"
 
 TESTPROG="$TS_HELPER_LIBMOUNT_CONTEXT"
@@ -79,7 +79,7 @@ function is_mounted {
 
 
 udevadm settle
-ts_device_has "TYPE" "ext4" $DEVICE || ts_die "Cannot find ext3 on $DEVICE"
+ts_device_has "TYPE" "ext4" $DEVICE || ts_die "Cannot find ext2 on $DEVICE"
 
 
 ts_init_subtest "mount-by-devname"
@@ -136,7 +136,7 @@ ts_finalize_subtest
 ts_init_subtest "mount-loopdev"
 mkdir -p $MOUNTPOINT &> /dev/null
 img=$(ts_image_init)
-mkfs.ext3 -F $img &> /dev/null
+mkfs.ext2 -F $img &> /dev/null
 udevadm settle
 
 ts_run $TESTPROG --mount -o loop $img $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG

diff --git a/tests/ts/libmount/context-py b/tests/ts/libmount/context-py
index 959d79058b5d33bd1a5490121110dc88a05e5c4a..a6a081694bb4e9607d4b0e82f88a3ae6e7d7b3c0 100755 (executable)
--- a/tests/ts/libmount/context-py
+++ b/tests/ts/libmount/context-py
@@ -15,7 +15,7 @@ ts_check_test_command "$TS_CMD_UMOUNT"
 ts_check_test_command "$TS_CMD_UUIDGEN"
 
 ts_skip_nonroot
-ts_check_prog "mkfs.ext3"
+ts_check_prog "mkfs.ext2"
 ts_check_prog "mkfs.ext4"
 
 ts_init_py libmount
@@ -88,7 +88,7 @@ function is_mounted {
 
 
 udevadm settle
-ts_device_has "TYPE" "ext4" $DEVICE || ts_die "Cannot find ext3 on $DEVICE"
+ts_device_has "TYPE" "ext4" $DEVICE || ts_die "Cannot find ext2 on $DEVICE"
 
 
 ts_init_subtest "mount-by-devname"
@@ -143,7 +143,7 @@ ts_finalize_subtest
 ts_init_subtest "mount-loopdev"
 mkdir -p $MOUNTPOINT &> /dev/null
 img=$(ts_image_init)
-mkfs.ext3 -F $img &> /dev/null
+mkfs.ext2 -F $img &> /dev/null
 udevadm settle
 
 $PYTHON $TESTPROG --mount -o loop $img $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG

diff --git a/tests/ts/libmount/loop b/tests/ts/libmount/loop
index 9d1d17e859129d55f02ceeb2841e1a620c5d444b..6de00ee1c1322e2132faaae0b04b6d02f0293447 100755 (executable)
--- a/tests/ts/libmount/loop
+++ b/tests/ts/libmount/loop
@@ -29,7 +29,7 @@ ts_check_test_command "$TS_CMD_LOSETUP"
 
 ts_skip_nonroot
 ts_check_losetup
-ts_check_prog "mkfs.ext3"
+ts_check_prog "mkfs.ext2"
 
 function verify_mount_dev {
        local dev=$1
@@ -47,7 +47,7 @@ function verify_mount_dev {
 #
 BACKFILE=$(ts_image_init 10)
 
-mkfs.ext3 -F $BACKFILE &> /dev/null || ts_die "Cannot make ext3 on $BACKFILE"
+mkfs.ext2 -F $BACKFILE &> /dev/null || ts_die "Cannot make ext2 on $BACKFILE"
 
 # All tests are separated by "udevadm settle" because loop device exists some time after
 # "losetup -d". This device confuses some tests. And find-race-condition, tests,

diff --git a/tests/ts/libmount/loop-overlay b/tests/ts/libmount/loop-overlay
index 39ccd904f187829759e81037aa635d480bc98daf..62874a182baad65d1209d583217492fa586d61f2 100755 (executable)
--- a/tests/ts/libmount/loop-overlay
+++ b/tests/ts/libmount/loop-overlay
@@ -27,7 +27,7 @@ ts_check_test_command "$TS_CMD_UMOUNT"
 
 ts_skip_nonroot
 ts_check_losetup
-ts_check_prog "mkfs.ext3"
+ts_check_prog "mkfs.ext2"
 ts_check_prog "dd"
 ts_check_prog "stat"
 

diff --git a/tests/ts/libmount/tabfiles-tags b/tests/ts/libmount/tabfiles-tags
index 69b06a95a13cebcce733eb307059710f323b27f2..c5452cf146482b622e4ca6db873bd1d724947cc8 100755 (executable)
--- a/tests/ts/libmount/tabfiles-tags
+++ b/tests/ts/libmount/tabfiles-tags
@@ -15,7 +15,7 @@ fi
 TESTPROG="$TS_HELPER_LIBMOUNT_TAB"
 
 [ -x $TESTPROG ] || ts_skip "test not compiled"
-ts_check_prog "mkfs.ext3"
+ts_check_prog "mkfs.ext2"
 
 # set global variable TS_DEVICE
 ts_scsi_debug_init dev_size_mb=50 sector_size=512
@@ -25,7 +25,7 @@ UUID="de1bc6e9-34ab-4151-a1d7-900042eee8d9"
 #
 # Create filesystem
 #
-mkfs.ext3 -F -L $LABEL $TS_DEVICE -U $UUID &> /dev/null || ts_die "Cannot make ext3 on $TS_DEVICE"
+mkfs.ext2 -F -L $LABEL $TS_DEVICE -U $UUID &> /dev/null || ts_die "Cannot make ext2 on $TS_DEVICE"
 ts_device_has "LABEL" "$LABEL" "$TS_DEVICE" || ts_die "Cannot find  LABEL '$LABEL' on $TS_DEVICE"
 ts_device_has "UUID" "$UUID" "$TS_DEVICE" || ts_die "Cannot find $UUID on $TS_DEVICE"
 

diff --git a/tests/ts/libmount/tabfiles-tags-py b/tests/ts/libmount/tabfiles-tags-py
index d252a5478afe41d136fc8089a7e22b0627cf70d9..171f189896034dd248b68dd66ed2cff06c234300 100755 (executable)
--- a/tests/ts/libmount/tabfiles-tags-py
+++ b/tests/ts/libmount/tabfiles-tags-py
@@ -17,7 +17,7 @@ fi
 TESTPROG="$TS_HELPER_PYLIBMOUNT_TAB"
 [ -x $TESTPROG ] || ts_die "test script missing"
 
-ts_check_prog "mkfs.ext3"
+ts_check_prog "mkfs.ext2"
 
 PYDBG="$PYTHON -m pdb"
 
@@ -29,7 +29,7 @@ UUID="de1bc6e9-34ab-4151-a1d7-900042eee8d9"
 #
 # Create filesystem
 #
-mkfs.ext3 -F -L $LABEL $TS_DEVICE -U $UUID &> /dev/null || ts_die "Cannot make ext3 on $TS_DEVICE"
+mkfs.ext2 -F -L $LABEL $TS_DEVICE -U $UUID &> /dev/null || ts_die "Cannot make ext2 on $TS_DEVICE"
 ts_device_has "LABEL" "$LABEL" "$TS_DEVICE" || ts_die "Cannot find  LABEL '$LABEL' on $TS_DEVICE"
 ts_device_has "UUID" "$UUID" "$TS_DEVICE" || ts_die "Cannot find $UUID on $TS_DEVICE"
 

diff --git a/tests/ts/mount/devname b/tests/ts/mount/devname
index a311a43ee7764b8793ad3aaf68db0f1d3096c3f8..f4ebc6dfaa8826c795f9e7ca0d36863973217d7a 100755 (executable)
--- a/tests/ts/mount/devname
+++ b/tests/ts/mount/devname
@@ -27,7 +27,7 @@ ts_check_test_command "$TS_CMD_UMOUNT"
 
 ts_skip_nonroot
 ts_check_losetup
-ts_check_prog "mkfs.ext3"
+ts_check_prog "mkfs.ext2"
 
 ts_device_init
 DEVICE=$TS_LODEV
@@ -38,9 +38,9 @@ if [ "$has_mtab" == "yes" ]; then
        MTAB_FILE="/etc/mtab"
 fi
 
-mkfs.ext3 $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE"
+mkfs.ext2 $DEVICE &> /dev/null || ts_die "Cannot make ext2 on $DEVICE"
 
-ts_device_has "TYPE" "ext3" $DEVICE || ts_die "Cannot find ext3 on $DEVICE"
+ts_device_has "TYPE" "ext2" $DEVICE || ts_die "Cannot find ext2 on $DEVICE"
 
 [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
 

diff --git a/tests/ts/mount/fslists b/tests/ts/mount/fslists
index cb243d5ea098e96594a052077a3692c4d5ac8505..74a87f6a79966231883beab403e55cf62661f5e1 100755 (executable)
--- a/tests/ts/mount/fslists
+++ b/tests/ts/mount/fslists
@@ -27,14 +27,14 @@ ts_check_test_command "$TS_CMD_UMOUNT"
 
 ts_skip_nonroot
 ts_check_losetup
-ts_check_prog "mkfs.ext3"
+ts_check_prog "mkfs.ext2"
 
 ts_device_init
 DEVICE=$TS_LODEV
 
-mkfs.ext3 $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE"
+mkfs.ext2 $DEVICE &> /dev/null || ts_die "Cannot make ext2 on $DEVICE"
 
-ts_device_has "TYPE" "ext3" $DEVICE || ts_die "Cannot find ext3 on $DEVICE"
+ts_device_has "TYPE" "ext2" $DEVICE || ts_die "Cannot find ext2 on $DEVICE"
 
 # Don't forget that $TS_MOUNTPOINT is subtest specific, don't create it
 # globally!
@@ -42,7 +42,7 @@ ts_device_has "TYPE" "ext3" $DEVICE || ts_die "Cannot find ext3 on $DEVICE"
 
 ts_init_subtest "one-type"
 [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
-$TS_CMD_MOUNT -t ext3 $DEVICE $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT -t ext2 $DEVICE $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
 ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts"
 $TS_CMD_UMOUNT $TS_MOUNTPOINT
 ts_log "Success"
@@ -51,7 +51,7 @@ ts_finalize_subtest
 
 ts_init_subtest "more-types"
 [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
-$TS_CMD_MOUNT -t foo,bar,ext3 $DEVICE $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT -t foo,bar,ext2 $DEVICE $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
 ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts"
 $TS_CMD_UMOUNT $TS_MOUNTPOINT
 ts_log "Success"
@@ -60,7 +60,7 @@ ts_finalize_subtest
 
 ts_init_subtest "more-types-fstab"
 [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
-ts_fstab_add $DEVICE $TS_MOUNTPOINT "foo,bar,ext3"
+ts_fstab_add $DEVICE $TS_MOUNTPOINT "foo,bar,ext2"
 $TS_CMD_MOUNT $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
 ts_fstab_clean
 ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts"
@@ -80,7 +80,7 @@ ts_finalize_subtest
 
 ts_init_subtest "type-pattern-neg"
 [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
-$TS_CMD_MOUNT -i -t nofoo,bar,ext3,ext2,ext4 $DEVICE $TS_MOUNTPOINT &> /dev/null
+$TS_CMD_MOUNT -i -t nofoo,bar,ext2,ext2,ext4 $DEVICE $TS_MOUNTPOINT &> /dev/null
 ts_is_mounted $DEVICE && ts_die "$DEVICE unexpectedly mounted"
 ts_log "Success"
 ts_finalize_subtest

diff --git a/tests/ts/mount/fstab-devname b/tests/ts/mount/fstab-devname
index 95a014dae0681ea5c76f079eaf063fff40ad24ea..4e4961edeccac4e87226eb33a0ac076db796409d 100755 (executable)
--- a/tests/ts/mount/fstab-devname
+++ b/tests/ts/mount/fstab-devname
@@ -26,14 +26,14 @@ ts_check_test_command "$TS_CMD_UMOUNT"
 
 ts_skip_nonroot
 ts_check_losetup
-ts_check_prog "mkfs.ext3"
+ts_check_prog "mkfs.ext2"
 
 ts_device_init
 DEVICE=$TS_LODEV
 
-mkfs.ext3 $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE"
+mkfs.ext2 $DEVICE &> /dev/null || ts_die "Cannot make ext2 on $DEVICE"
 
-ts_device_has "TYPE" "ext3" $DEVICE || ts_die "Cannot find ext3 on $DEVICE"
+ts_device_has "TYPE" "ext2" $DEVICE || ts_die "Cannot find ext2 on $DEVICE"
 
 [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
 

diff --git a/tests/ts/mount/fstab-devname2label b/tests/ts/mount/fstab-devname2label
index cd39dfd89c3a286b65199c826b48b24ecf3eb67f..7257fbc8987fca48be6034a746f85ca50902981d 100755 (executable)
--- a/tests/ts/mount/fstab-devname2label
+++ b/tests/ts/mount/fstab-devname2label
@@ -27,12 +27,12 @@ ts_check_test_command "$TS_CMD_UMOUNT"
 
 ts_skip_nonroot
 ts_check_losetup
-ts_check_prog "mkfs.ext3"
+ts_check_prog "mkfs.ext2"
 
 ts_device_init
 DEVICE=$TS_LODEV
 
-mkfs.ext3 -L $LABEL $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE"
+mkfs.ext2 -L $LABEL $DEVICE &> /dev/null || ts_die "Cannot make ext2 on $DEVICE"
 ts_device_has "LABEL" $LABEL $DEVICE \
  || ts_die "Cannot find LABEL '$LABEL' on $DEVICE"
 

diff --git a/tests/ts/mount/fstab-devname2uuid b/tests/ts/mount/fstab-devname2uuid
index 90c61c30981541869fbcb60d79188ca81796bd81..02b3ee161bbb112926ea12919719d9b4baae205c 100755 (executable)
--- a/tests/ts/mount/fstab-devname2uuid
+++ b/tests/ts/mount/fstab-devname2uuid
@@ -26,12 +26,12 @@ ts_check_test_command "$TS_CMD_UMOUNT"
 
 ts_skip_nonroot
 ts_check_losetup
-ts_check_prog "mkfs.ext3"
+ts_check_prog "mkfs.ext2"
 
 ts_device_init
 DEVICE=$TS_LODEV
 
-mkfs.ext3 $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE"
+mkfs.ext2 $DEVICE &> /dev/null || ts_die "Cannot make ext2 on $DEVICE"
 UUID=$(ts_uuid_by_devname "$DEVICE") || ts_die "Cannot find UUID on $DEVICE"
 
 [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT

diff --git a/tests/ts/mount/fstab-label b/tests/ts/mount/fstab-label
index 5f40a87479b8c5a7906aaa35870a56eefd938ee8..a86bdf6c0787dc3390334d4fcd726898cb7068d0 100755 (executable)
--- a/tests/ts/mount/fstab-label
+++ b/tests/ts/mount/fstab-label
@@ -27,12 +27,12 @@ ts_check_test_command "$TS_CMD_UMOUNT"
 
 ts_skip_nonroot
 ts_check_losetup
-ts_check_prog "mkfs.ext3"
+ts_check_prog "mkfs.ext2"
 
 ts_device_init
 DEVICE=$TS_LODEV
 
-mkfs.ext3 -L $LABEL $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE"
+mkfs.ext2 -L $LABEL $DEVICE &> /dev/null || ts_die "Cannot make ext2 on $DEVICE"
 ts_device_has "LABEL" $LABEL $DEVICE \
  || ts_die "Cannot find LABEL '$LABEL' on $DEVICE"
 

diff --git a/tests/ts/mount/fstab-label2devname b/tests/ts/mount/fstab-label2devname
index e9cebb38e5ddc920114241b8ba90e8c73ae3419e..181352aef50df2bb5a939bddb36769d67716b8f0 100755 (executable)
--- a/tests/ts/mount/fstab-label2devname
+++ b/tests/ts/mount/fstab-label2devname
@@ -27,12 +27,12 @@ ts_check_test_command "$TS_CMD_UMOUNT"
 
 ts_skip_nonroot
 ts_check_losetup
-ts_check_prog "mkfs.ext3"
+ts_check_prog "mkfs.ext2"
 
 ts_device_init
 DEVICE=$TS_LODEV
 
-mkfs.ext3 -L $LABEL $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE"
+mkfs.ext2 -L $LABEL $DEVICE &> /dev/null || ts_die "Cannot make ext2 on $DEVICE"
 ts_device_has "LABEL" $LABEL $DEVICE \
  || ts_die "Cannot find LABEL '$LABEL' on $DEVICE"
 

diff --git a/tests/ts/mount/fstab-label2uuid b/tests/ts/mount/fstab-label2uuid
index 1a97bc0d561c740e45429062659cf1a38014bfb6..027bf8059ce2e1bda280d6cd273cff9742a504ca 100755 (executable)
--- a/tests/ts/mount/fstab-label2uuid
+++ b/tests/ts/mount/fstab-label2uuid
@@ -28,12 +28,12 @@ ts_check_test_command "$TS_CMD_UMOUNT"
 
 ts_skip_nonroot
 ts_check_losetup
-ts_check_prog "mkfs.ext3"
+ts_check_prog "mkfs.ext2"
 
 ts_device_init
 DEVICE=$TS_LODEV
 
-mkfs.ext3 -L $LABEL $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE"
+mkfs.ext2 -L $LABEL $DEVICE &> /dev/null || ts_die "Cannot make ext2 on $DEVICE"
 ts_device_has "LABEL" $LABEL $DEVICE \
  || ts_die "Cannot find LABEL '$LABEL' on $DEVICE"
 UUID=$(ts_uuid_by_devname "$DEVICE") || ts_die "Cannot find UUID on $DEVICE"

diff --git a/tests/ts/mount/fstab-loop b/tests/ts/mount/fstab-loop
index 4b56694c875f040cad6f100173db884f92fb1e8b..7d4fbff3c6e73dd0b5b60df2e1a982347b8dc99a 100755 (executable)
--- a/tests/ts/mount/fstab-loop
+++ b/tests/ts/mount/fstab-loop
@@ -26,11 +26,11 @@ ts_check_test_command "$TS_CMD_UMOUNT"
 
 ts_skip_nonroot
 ts_check_losetup
-ts_check_prog "mkfs.ext3"
+ts_check_prog "mkfs.ext2"
 
 IMG=$(ts_image_init)
 
-mkfs.ext3 -F $IMG &> /dev/null || ts_die "Cannot make ext3 on $IMG"
+mkfs.ext2 -F $IMG &> /dev/null || ts_die "Cannot make ext2 on $IMG"
 
 [ -d "$TS_MOUNTPOINT-1" ] || mkdir -p $TS_MOUNTPOINT-1
 [ -d "$TS_MOUNTPOINT-2" ] || mkdir -p $TS_MOUNTPOINT-2
@@ -38,10 +38,10 @@ mkfs.ext3 -F $IMG &> /dev/null || ts_die "Cannot make ext3 on $IMG"
 ts_fstab_lock
 ts_fstab_open
 
-ts_fstab_addline "$IMG" "$TS_MOUNTPOINT-1" "ext3" "loop"
+ts_fstab_addline "$IMG" "$TS_MOUNTPOINT-1" "ext2" "loop"
 $TS_CMD_MOUNT -a >> $TS_OUTPUT 2>> $TS_ERRLOG
 
-ts_fstab_addline "$IMG" "$TS_MOUNTPOINT-2" "ext3" "loop"
+ts_fstab_addline "$IMG" "$TS_MOUNTPOINT-2" "ext2" "loop"
 $TS_CMD_MOUNT -a >> $TS_OUTPUT 2>> $TS_ERRLOG
 
 ts_fstab_close

diff --git a/tests/ts/mount/fstab-symlink b/tests/ts/mount/fstab-symlink
index 34934734e81d9018b91fcdc00fd5f5689763d6e9..9f63a5afc82254e6f44cbb3bd0cd88f8a422dc3b 100755 (executable)
--- a/tests/ts/mount/fstab-symlink
+++ b/tests/ts/mount/fstab-symlink
@@ -27,16 +27,16 @@ ts_check_test_command "$TS_CMD_UMOUNT"
 
 ts_skip_nonroot
 ts_check_losetup
-ts_check_prog "mkfs.ext3"
+ts_check_prog "mkfs.ext2"
 
 LINKNAME="$TS_OUTDIR/${TS_TESTNAME}_lnk"
 
 ts_device_init
 DEVICE=$TS_LODEV
 
-mkfs.ext3 $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE"
+mkfs.ext2 $DEVICE &> /dev/null || ts_die "Cannot make ext2 on $DEVICE"
 
-ts_device_has "TYPE" "ext3" $DEVICE || ts_die "Cannot find ext3 on $DEVICE"
+ts_device_has "TYPE" "ext2" $DEVICE || ts_die "Cannot find ext2 on $DEVICE"
 
 [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
 

diff --git a/tests/ts/mount/fstab-uuid b/tests/ts/mount/fstab-uuid
index 6f4ec1f0d46e877732bf1651e5f8acb7bf1ad193..ce4c86ea85ce94e2e9bd4ee79e599adaba338442 100755 (executable)
--- a/tests/ts/mount/fstab-uuid
+++ b/tests/ts/mount/fstab-uuid
@@ -26,12 +26,12 @@ ts_check_test_command "$TS_CMD_UMOUNT"
 
 ts_skip_nonroot
 ts_check_losetup
-ts_check_prog "mkfs.ext3"
+ts_check_prog "mkfs.ext2"
 
 ts_device_init
 DEVICE=$TS_LODEV
 
-mkfs.ext3 $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE"
+mkfs.ext2 $DEVICE &> /dev/null || ts_die "Cannot make ext2 on $DEVICE"
 UUID=$(ts_uuid_by_devname "$DEVICE") || ts_die "Cannot find UUID on $DEVICE"
 
 [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT

diff --git a/tests/ts/mount/fstab-uuid2devname b/tests/ts/mount/fstab-uuid2devname
index 47c7a7315a8fa26ead74081e7912e51f78c593aa..4ce72556c0ef71946e88ef0bd04deda42d29eaf9 100755 (executable)
--- a/tests/ts/mount/fstab-uuid2devname
+++ b/tests/ts/mount/fstab-uuid2devname
@@ -26,12 +26,12 @@ ts_check_test_command "$TS_CMD_UMOUNT"
 
 ts_skip_nonroot
 ts_check_losetup
-ts_check_prog "mkfs.ext3"
+ts_check_prog "mkfs.ext2"
 
 ts_device_init
 DEVICE=$TS_LODEV
 
-mkfs.ext3 $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE"
+mkfs.ext2 $DEVICE &> /dev/null || ts_die "Cannot make ext2 on $DEVICE"
 UUID=$(ts_uuid_by_devname "$DEVICE") || ts_die "Cannot find UUID on $DEVICE"
 
 [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT

diff --git a/tests/ts/mount/fstab-uuid2label b/tests/ts/mount/fstab-uuid2label
index 9b0c61508a46efb82ce88a1f79a449388c955783..b1f983df1c598b7429a85b247fd15a325eb6c272 100755 (executable)
--- a/tests/ts/mount/fstab-uuid2label
+++ b/tests/ts/mount/fstab-uuid2label
@@ -27,12 +27,12 @@ ts_check_test_command "$TS_CMD_UMOUNT"
 
 ts_skip_nonroot
 ts_check_losetup
-ts_check_prog "mkfs.ext3"
+ts_check_prog "mkfs.ext2"
 
 ts_device_init
 DEVICE=$TS_LODEV
 
-mkfs.ext3 -L $LABEL $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE"
+mkfs.ext2 -L $LABEL $DEVICE &> /dev/null || ts_die "Cannot make ext2 on $DEVICE"
 ts_device_has "LABEL" $LABEL $DEVICE \
  || ts_die "Cannot find LABEL '$LABEL' on $DEVICE"
 UUID=$(ts_uuid_by_devname "$DEVICE") || ts_die "Cannot find UUID on $DEVICE"

diff --git a/tests/ts/mount/label b/tests/ts/mount/label
index adb4ac120931baacb7653a07a6b0cd4929bcaaa1..a5b9622dfb6d85183be4ec747aca08be1c5b6498 100755 (executable)
--- a/tests/ts/mount/label
+++ b/tests/ts/mount/label
@@ -28,12 +28,12 @@ ts_check_test_command "$TS_CMD_UMOUNT"
 
 ts_skip_nonroot
 ts_check_losetup
-ts_check_prog "mkfs.ext3"
+ts_check_prog "mkfs.ext2"
 
 ts_device_init
 DEVICE=$TS_LODEV
 
-mkfs.ext3 -L $LABEL $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE"
+mkfs.ext2 -L $LABEL $DEVICE &> /dev/null || ts_die "Cannot make ext2 on $DEVICE"
 ts_device_has "LABEL" $LABEL $DEVICE \
  || ts_die "Cannot find LABEL '$LABEL' on $DEVICE"
 

diff --git a/tests/ts/mount/regfile b/tests/ts/mount/regfile
index 8cdf6956a7fdaa95c8e5cb2ed42f49bb2feab884..d56f50775b7c0d56895204f2d1bcff16c881cb0f 100755 (executable)
--- a/tests/ts/mount/regfile
+++ b/tests/ts/mount/regfile
@@ -14,10 +14,10 @@ ts_check_test_command "$TS_CMD_UMOUNT"
 
 ts_skip_nonroot
 ts_check_losetup
-ts_check_prog "mkfs.ext3"
+ts_check_prog "mkfs.ext2"
 
 IMAGE=$(ts_image_init)
-mkfs.ext3 -F $IMAGE &> /dev/null || ts_die "Cannot make ext3 on $IMAGE"
+mkfs.ext2 -F $IMAGE &> /dev/null || ts_die "Cannot make ext2 on $IMAGE"
 
 [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
 

diff --git a/tests/ts/mount/rlimit b/tests/ts/mount/rlimit
index 9564d7046a0635dddb7e7eb1ab3e57470a8e15d7..50d915387d835178c6609e18f64e33aba3c638c5 100755 (executable)
--- a/tests/ts/mount/rlimit
+++ b/tests/ts/mount/rlimit
@@ -35,7 +35,7 @@ ts_check_test_command "$TS_HELPER_MD5"
 
 ts_skip_nonroot
 ts_check_losetup
-ts_check_prog "mkfs.ext3"
+ts_check_prog "mkfs.ext2"
 
 has_mtab=$( ts_has_mtab_support )
 [ "$has_mtab" == "yes" ] || ts_skip "mtab unsupported"
@@ -51,7 +51,7 @@ function mtab_checksum()
 ts_device_init
 DEVICE=$TS_LODEV
 
-mkfs.ext3 $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE"
+mkfs.ext2 $DEVICE &> /dev/null || ts_die "Cannot make ext2 on $DEVICE"
 
 
 ts_init_subtest "mount"

diff --git a/tests/ts/mount/shared-subtree b/tests/ts/mount/shared-subtree
index fe6e27d2681154bbb1c72ff4e4b63615fe401ef6..44b460b57cef085e3a22d78fc36f99cd07a669b6 100755 (executable)
--- a/tests/ts/mount/shared-subtree
+++ b/tests/ts/mount/shared-subtree
@@ -12,7 +12,7 @@ ts_check_test_command "$TS_CMD_FINDMNT"
 
 ts_skip_nonroot
 ts_check_losetup
-ts_check_prog "mkfs.ext3"
+ts_check_prog "mkfs.ext2"
 
 [ -d $TS_MOUNTPOINT ] || mkdir -p $TS_MOUNTPOINT
 
@@ -62,8 +62,8 @@ ts_finalize_subtest
 ts_device_init
 DEVICE=$TS_LODEV
 
-mkfs.ext3 $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE"
-ts_device_has "TYPE" "ext3" $DEVICE || ts_die "Cannot find ext3 on $DEVICE"
+mkfs.ext2 $DEVICE &> /dev/null || ts_die "Cannot make ext2 on $DEVICE"
+ts_device_has "TYPE" "ext2" $DEVICE || ts_die "Cannot find ext2 on $DEVICE"
 
 
 ts_init_subtest "mount-private"

diff --git a/tests/ts/mount/uuid b/tests/ts/mount/uuid
index 7b106a0bd072b06fefcf29cd5549312b5c58892d..ddf05f2497fc2e2d74163d0fa8fe5d17717799f7 100755 (executable)
--- a/tests/ts/mount/uuid
+++ b/tests/ts/mount/uuid
@@ -26,12 +26,12 @@ ts_check_test_command "$TS_CMD_UMOUNT"
 
 ts_skip_nonroot
 ts_check_losetup
-ts_check_prog "mkfs.ext3"
+ts_check_prog "mkfs.ext2"
 
 ts_device_init
 DEVICE=$TS_LODEV
 
-mkfs.ext3 $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE"
+mkfs.ext2 $DEVICE &> /dev/null || ts_die "Cannot make ext2 on $DEVICE"
 UUID=$(ts_uuid_by_devname "$DEVICE") || ts_die "Cannot find UUID on $DEVICE"
 
 [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT