diff options
| author | Dimitri John Ledkov <xnox@ubuntu.com> | 2017-11-07 09:51:30 -0500 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2017-11-07 17:51:30 +0300 |
| commit | 4b742c8acdd0d6bf3f9e9664f22e355da762f49e (patch) | |
| tree | 3b093901cd9b3a8b889df5d751bf39d2e26dac97 /test | |
| parent | 7a5cb197d8f592501db5670a372f0b9182d383ff (diff) | |
| download | systemd-4b742c8acdd0d6bf3f9e9664f22e355da762f49e.tar.gz systemd-4b742c8acdd0d6bf3f9e9664f22e355da762f49e.tar.bz2 systemd-4b742c8acdd0d6bf3f9e9664f22e355da762f49e.zip | |
test: switch to using ext4 instead of ext3 as default fallback fs (#7265)
Using ext3 is not representative anymore, and Ubuntu has stopped shipping
fsck.ext3 in the initramfs.
Diffstat (limited to 'test')
| -rwxr-xr-x | test/TEST-02-CRYPTSETUP/test.sh | 4 | ||||
| -rw-r--r-- | test/test-functions | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test/TEST-02-CRYPTSETUP/test.sh b/test/TEST-02-CRYPTSETUP/test.sh index 1280148b58..545602e17a 100755 --- a/test/TEST-02-CRYPTSETUP/test.sh +++ b/test/TEST-02-CRYPTSETUP/test.sh @@ -31,7 +31,7 @@ test_setup() { echo -n test >$TESTDIR/keyfile cryptsetup -q luksFormat ${LOOPDEV}p2 $TESTDIR/keyfile cryptsetup luksOpen ${LOOPDEV}p2 varcrypt <$TESTDIR/keyfile - mkfs.ext3 -L var /dev/mapper/varcrypt + mkfs.ext4 -L var /dev/mapper/varcrypt mkdir -p $TESTDIR/root mount ${LOOPDEV}p1 $TESTDIR/root mkdir -p $TESTDIR/root/var @@ -67,7 +67,7 @@ EOF cat $initdir/etc/crypttab | ddebug cat >>$initdir/etc/fstab <<EOF -/dev/mapper/varcrypt /var ext3 defaults 0 1 +/dev/mapper/varcrypt /var ext4 defaults 0 1 EOF ) || return 1 diff --git a/test/test-functions b/test/test-functions index 745c0a9abe..65bdd44f09 100644 --- a/test/test-functions +++ b/test/test-functions @@ -12,7 +12,7 @@ KERNEL_MODS="/lib/modules/$KERNEL_VER/" QEMU_TIMEOUT="${QEMU_TIMEOUT:-infinity}" NSPAWN_TIMEOUT="${NSPAWN_TIMEOUT:-infinity}" TIMED_OUT= # will be 1 after run_* if *_TIMEOUT is set and test timed out -[[ "$LOOKS_LIKE_SUSE" ]] && FSTYPE="${FSTYPE:-btrfs}" || FSTYPE="${FSTYPE:-ext3}" +[[ "$LOOKS_LIKE_SUSE" ]] && FSTYPE="${FSTYPE:-btrfs}" || FSTYPE="${FSTYPE:-ext4}" UNIFIED_CGROUP_HIERARCHY="${UNIFIED_CGROUP_HIERARCHY:-default}" if ! ROOTLIBDIR=$(pkg-config --variable=systemdutildir systemd); then |