From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Mon, 5 Sep 2022 11:54:22 +0000 (+0200)
Subject: test: mark knot.conf tmpfiles config as optional
X-Git-Tag: v252-rc1~254^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e4050ff41eab89f481049a53a9c3215fcaca79a0;p=thirdparty%2Fsystemd.git

test: mark knot.conf tmpfiles config as optional

Since it got removed in the recent knot release.

See: https://github.com/CZ-NIC/knot/commit/a6971a4025133a77b29f6d2b381b40dc0499730c
---

diff --git a/test/TEST-75-RESOLVED/test.sh b/test/TEST-75-RESOLVED/test.sh
index cbf35ee2926..6c63db65fb3 100755
--- a/test/TEST-75-RESOLVED/test.sh
+++ b/test/TEST-75-RESOLVED/test.sh
@@ -24,8 +24,8 @@ test_append_files() {
     local workspace="${1:?}"
     # Install knot
     image_install kzonecheck keymgr kjournalprint knotc knotd
-    image_install /lib/tmpfiles.d/knot.conf
     image_install "${ROOTLIBDIR:?}/system/knot.service"
+    image_install -o /lib/tmpfiles.d/knot.conf
     image_install -o /etc/dbus-1/system.d/cz.nic.knotd.conf
     image_install -o /etc/default/knot
 
diff --git a/test/units/testsuite-75.sh b/test/units/testsuite-75.sh
index 08abc3f272b..81a2ab37d03 100755
--- a/test/units/testsuite-75.sh
+++ b/test/units/testsuite-75.sh
@@ -64,6 +64,12 @@ ln -svf /etc/bind.keys /etc/bind/bind.keys
 # Start the services
 systemctl unmask systemd-networkd systemd-resolved
 systemctl start systemd-networkd systemd-resolved
+# Create knot's runtime dir, since from certain version it's provided only by
+# the package and not created by tmpfiles/systemd
+if [[ ! -d /run/knot ]]; then
+    mkdir -p /run/knot
+    chown -R knot:knot /run/knot
+fi
 systemctl start knot
 # Wait a bit for the keys to propagate
 sleep 4