]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
test: use dropin dir 30867/head
authorDavid Tardon <dtardon@redhat.com>
Fri, 5 Jan 2024 15:10:50 +0000 (16:10 +0100)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Thu, 11 Jan 2024 20:12:44 +0000 (05:12 +0900)
test/units/testsuite-17.03.sh

index d19d85074f51e1bae00825fb9d241b5f72df4b1f..d6b31622588fca4b8b63cbf3fea44689a068a11c 100755 (executable)
@@ -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
 }