picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

test: switch to using ext4 instead of ext3 as default fallback fs (#7265)

Browse source 
Using ext3 is not representative anymore, and Ubuntu has stopped shipping
fsck.ext3 in the initramfs.
This commit is contained in:
Dimitri John Ledkov 2017-11-07 09:51:30 -05:00 committed by Lennart Poettering
parent 7a5cb197d8
commit 4b742c8acd
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
test/TEST-02-CRYPTSETUP/test.sh
View file

@ -31,7 +31,7 @@ test_setup() {
echo -n test >$TESTDIR/keyfile echo -n test >$TESTDIR/keyfile
cryptsetup -q luksFormat ${LOOPDEV}p2 $TESTDIR/keyfile cryptsetup -q luksFormat ${LOOPDEV}p2 $TESTDIR/keyfile
cryptsetup luksOpen ${LOOPDEV}p2 varcrypt <$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 mkdir -p $TESTDIR/root
mount ${LOOPDEV}p1 $TESTDIR/root mount ${LOOPDEV}p1 $TESTDIR/root
mkdir -p $TESTDIR/root/var mkdir -p $TESTDIR/root/var
@ -67,7 +67,7 @@ EOF
cat $initdir/etc/crypttab | ddebug cat $initdir/etc/crypttab | ddebug
cat >>$initdir/etc/fstab <<EOF cat >>$initdir/etc/fstab <<EOF
/dev/mapper/varcrypt /var ext3 defaults 0 1 /dev/mapper/varcrypt /var ext4 defaults 0 1
EOF EOF
) || return 1 ) || return 1

2
test/test-functions
View file

@ -12,7 +12,7 @@ KERNEL_MODS="/lib/modules/$KERNEL_VER/"
QEMU_TIMEOUT="${QEMU_TIMEOUT:-infinity}" QEMU_TIMEOUT="${QEMU_TIMEOUT:-infinity}"
NSPAWN_TIMEOUT="${NSPAWN_TIMEOUT:-infinity}" NSPAWN_TIMEOUT="${NSPAWN_TIMEOUT:-infinity}"
TIMED_OUT= # will be 1 after run_* if *_TIMEOUT is set and test timed out 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}" UNIFIED_CGROUP_HIERARCHY="${UNIFIED_CGROUP_HIERARCHY:-default}"
if ! ROOTLIBDIR=$(pkg-config --variable=systemdutildir systemd); then if ! ROOTLIBDIR=$(pkg-config --variable=systemdutildir systemd); then