From: David Tardon <dtardon@redhat.com>
Date: Fri, 5 Jan 2024 15:10:50 +0000 (+0100)
Subject: test: use dropin dir
X-Git-Tag: v256-rc1~1183^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F30867%2Fhead;p=thirdparty%2Fsystemd.git

test: use dropin dir
---

diff --git a/test/units/testsuite-17.03.sh b/test/units/testsuite-17.03.sh
index d19d85074f5..d6b31622588 100755
--- a/test/units/testsuite-17.03.sh
+++ b/test/units/testsuite-17.03.sh
@@ -4,11 +4,12 @@ set -eux
 
 TMPDIR=
 TEST_RULE="/run/udev/rules.d/49-test.rules"
+TEST_CONF="/run/udev/udev.conf.d/test-17.conf"
 KILL_PID=
 
 setup() {
     mkdir -p "${TEST_RULE%/*}"
-    [[ -e /etc/udev/udev.conf ]] && cp -f /etc/udev/udev.conf /etc/udev/udev.conf.bak
+    mkdir -p /run/udev/udev.conf.d
 
     cat >"${TEST_RULE}" <<EOF
 ACTION!="add", GOTO="test_end"
@@ -21,7 +22,7 @@ PROGRAM!="/bin/sleep 60", ENV{PROGRAM_RESULT}="KILLED"
 
 LABEL="test_end"
 EOF
-    cat >/etc/udev/udev.conf <<EOF
+    cat >"$TEST_CONF" <<EOF
 event_timeout=10
 timeout_signal=SIGABRT
 EOF
@@ -38,8 +39,7 @@ teardown() {
     fi
 
     rm -rf "$TMPDIR"
-    rm -f "$TEST_RULE"
-    [[ -e /etc/udev/udev.conf.bak ]] && mv -f /etc/udev/udev.conf.bak /etc/udev/udev.conf
+    rm -f "$TEST_RULE" "$TEST_CONF"
     systemctl restart systemd-udevd.service
 }