From: Frantisek Sumsal Date: Fri, 29 Sep 2023 14:07:05 +0000 (+0200) Subject: test: use /run/ for test configuration X-Git-Tag: v255-rc1~383^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F29374%2Fhead;p=thirdparty%2Fsystemd.git test: use /run/ for test configuration --- diff --git a/test/units/testsuite-75.sh b/test/units/testsuite-75.sh index f03ab29c283..56186de98e5 100755 --- a/test/units/testsuite-75.sh +++ b/test/units/testsuite-75.sh @@ -613,36 +613,36 @@ if command -v nft >/dev/null; then run systemd-run --scope -u test-nft.scope -p 'NFTSet=cgroup:inet:sd_test:c' nft list set inet sd_test c grep -qF "test-nft.scope" "$RUN_OUT" + mkdir -p /run/systemd/system # socket { echo "[Socket]" echo "ListenStream=12345" echo "BindToDevice=lo" echo "NFTSet=cgroup:inet:sd_test:c" - } >/etc/systemd/system/test-nft.socket + } >/run/systemd/system/test-nft.socket { echo "[Service]" echo "ExecStart=/usr/bin/sleep 10000" - } >/etc/systemd/system/test-nft.service + } >/run/systemd/system/test-nft.service systemctl daemon-reload systemctl start test-nft.socket systemctl status test-nft.socket run nft list set inet sd_test c grep -qF "test-nft.socket" "$RUN_OUT" systemctl stop test-nft.socket - rm /etc/systemd/system/test-nft.{socket,service} + rm -f /run/systemd/system/test-nft.{socket,service} # slice - mkdir /etc/systemd/system/system.slice.d + mkdir /run/systemd/system/system.slice.d { echo "[Slice]" echo "NFTSet=cgroup:inet:sd_test:c" - } >/etc/systemd/system/system.slice.d/00-test-nft.conf + } >/run/systemd/system/system.slice.d/00-test-nft.conf systemctl daemon-reload run nft list set inet sd_test c grep -qF "system.slice" "$RUN_OUT" - rm /etc/systemd/system/system.slice.d/00-test-nft.conf - rmdir /etc/systemd/system/system.slice.d + rm -rf /run/systemd/system/system.slice.d nft flush ruleset else