TEST-08: don't force ext4 for /

Forcing a specific fs for the image is usually a bad idea because the initrd
(borrowed from the host) is likely to include only support for the filesystem
used by the host's rootfs.

Since the point of this test is to check aliases on mount units, there's no
specific need for ext4, hence drop any parts that request or rely on ext4.

diff --git a/test/TEST-08-ISSUE-2730/test.sh b/test/TEST-08-ISSUE-2730/test.sh
index 8fc5f1c9074684b5b0d41faa9b1a82327690d1c1..83557f22ecdfce1de08b989283fc5d386ad4466c 100755 (executable)
--- a/test/TEST-08-ISSUE-2730/test.sh
+++ b/test/TEST-08-ISSUE-2730/test.sh
@@ -10,7 +10,6 @@ TEST_NO_NSPAWN=1
 . "${TEST_BASE_DIR:?}/test-functions"
 
 QEMU_TIMEOUT=300
-FSTYPE=ext4
 TEST_FORCE_NEWIMAGE=1
 
 do_test "$@"

diff --git a/test/testsuite-08.units/-.mount b/test/testsuite-08.units/-.mount
index 50750fec915f5fae02f27dea75680440d04b9be3..66f29afab98692e654abcedd96fa98a8d4b63c74 100644 (file)
--- a/test/testsuite-08.units/-.mount
+++ b/test/testsuite-08.units/-.mount
@@ -5,8 +5,7 @@ Before=local-fs.target
 [Mount]
 What=/dev/sda1
 Where=/
-Type=ext4
-Options=errors=remount-ro,noatime
+Options=noatime
 
 [Install]
 WantedBy=local-fs.target