Merging upstream version 256.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 0 insertions, 25 deletions

diff --git a/test/TEST-07-PID1/test.sh b/test/TEST-07-PID1/test.sh
index cc8a81f..2513406 100755
--- a/test/TEST-07-PID1/test.sh
+++ b/test/TEST-07-PID1/test.sh
@@ -11,31 +11,6 @@ NSPAWN_ARGUMENTS="--capability=CAP_NET_ADMIN"
 . "${TEST_BASE_DIR:?}/test-functions"
 
 test_append_files() {
-    local workspace="${1:?}"
-
-    # We might not be fast enough to hit the limit (20 triggers per 2 secs)
-    # in certain environments, i.e. when running without KVM or when collecting
-    # coverage. Let's help it a bit in such case.
-    if ! get_bool "$QEMU_KVM" || get_bool "$IS_BUILT_WITH_COVERAGE"; then
-        mkdir -p "$workspace/etc/systemd/system/issue2467.socket.d"
-        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
 }