summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFranck Bui <fbui@suse.com>2021-11-16 09:28:41 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2021-11-16 16:58:49 +0100
commit0c98f381e72bd9dce14c82760b394e5022ad3456 (patch)
tree43b341ebc17995be759702807dc181a2ba5909ee
parent054ed43075af2e35db85d14708d0aea7e848a5d6 (diff)
downloadsystemd-0c98f381e72bd9dce14c82760b394e5022ad3456.tar.gz
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.
-rwxr-xr-xtest/TEST-08-ISSUE-2730/test.sh1
-rw-r--r--test/testsuite-08.units/-.mount3
2 files changed, 1 insertions, 3 deletions
diff --git a/test/TEST-08-ISSUE-2730/test.sh b/test/TEST-08-ISSUE-2730/test.sh
index 8fc5f1c907..83557f22ec 100755
--- 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 50750fec91..66f29afab9 100644
--- 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