TEST-07-PID1: Move mount units to test dir

To load the units it is sufficient to add them to the units directory
and it's a step towards not needing any customisations for this test.

diff --git a/test/TEST-07-PID1/test.sh b/test/TEST-07-PID1/test.sh
index cc8a81f77df567092b575c2da71f4a528248a155..b60f1db68fddbd20914746995140fde264a7f8bd 100755 (executable)
--- a/test/TEST-07-PID1/test.sh
+++ b/test/TEST-07-PID1/test.sh
@@ -21,21 +21,6 @@ test_append_files() {
         printf "[Socket]\nTriggerLimitIntervalSec=10\n" >"$workspace/etc/systemd/system/issue2467.socket.d/TriggerLimitInterval.conf"
     fi
 
-    # Issue: https://github.com/systemd/systemd/issues/2730
-    mkdir -p "$workspace/etc/systemd/system/"
-    cat >"$workspace/etc/systemd/system/issue2730.mount" <<EOF
-[Mount]
-What=tmpfs
-Where=/issue2730
-Type=tmpfs
-
-[Install]
-WantedBy=local-fs.target
-Alias=issue2730-alias.mount
-EOF
-    "${SYSTEMCTL:?}" enable --root="$workspace" issue2730.mount
-    ln -svrf "$workspace/etc/systemd/system/issue2730.mount" "$workspace/etc/systemd/system/issue2730-alias.mount"
-
     image_install logger socat
 }
 

diff --git a/test/testsuite-07.units/issue2730-alias.mount b/test/testsuite-07.units/issue2730-alias.mount
new file mode 120000 (symlink)
index 0000000..802f026
--- /dev/null
+++ b/test/testsuite-07.units/issue2730-alias.mount
@@ -0,0 +1 @@
+issue2730.mount
\ No newline at end of file

diff --git a/test/testsuite-07.units/issue2730.mount b/test/testsuite-07.units/issue2730.mount
new file mode 100644 (file)
index 0000000..2ac76c0
--- /dev/null
+++ b/test/testsuite-07.units/issue2730.mount
@@ -0,0 +1,8 @@
+[Mount]
+What=tmpfs
+Where=/issue2730
+Type=tmpfs
+
+[Install]
+WantedBy=local-fs.target
+Alias=issue2730-alias.mount

diff --git a/test/testsuite-07.units/local-fs.target.wants/issue2730.mount b/test/testsuite-07.units/local-fs.target.wants/issue2730.mount
new file mode 120000 (symlink)
index 0000000..70a8534
--- /dev/null
+++ b/test/testsuite-07.units/local-fs.target.wants/issue2730.mount
@@ -0,0 +1 @@
+../issue2730.mount
\ No newline at end of file