diff --git a/test/TEST-75-RESOLVED/test.sh b/test/TEST-75-RESOLVED/test.sh index cbf35ee292..6c63db65fb 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 08abc3f272..5158536f49 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 @@ -81,7 +87,7 @@ if knotc zone-get test. onlinesign.test. ds | grep .; then fi # Propagate the new DS records while read -ra line; do - knotc zone-set test. "${line[@]}" + knotc zone-set test. "${line[0]}" 600 "${line[@]:1}" done < <(keymgr onlinesign.test. ds) knotc zone-commit test.