shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-02-15 09:57:39 +03:00
Code

Merge pull request #24566 from mrc0mmand/TEST-75-fix

Browse Source 
test: mark knot.conf tmpfiles config as optional
This commit is contained in:
Frantisek Sumsal 2022-09-05 17:48:24 +00:00 committed by GitHub
commit d5c8e5ac1b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/TEST-75-RESOLVED/test.sh
View File

@ -24,8 +24,8 @@ test_append_files() {
local workspace="${1:?}" local workspace="${1:?}"
# Install knot # Install knot
image_install kzonecheck keymgr kjournalprint knotc knotd image_install kzonecheck keymgr kjournalprint knotc knotd
image_install /lib/tmpfiles.d/knot.conf
image_install "${ROOTLIBDIR:?}/system/knot.service" 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/dbus-1/system.d/cz.nic.knotd.conf
image_install -o /etc/default/knot image_install -o /etc/default/knot

8
test/units/testsuite-75.sh
View File

@ -64,6 +64,12 @@ ln -svf /etc/bind.keys /etc/bind/bind.keys
# Start the services # Start the services
systemctl unmask systemd-networkd systemd-resolved systemctl unmask systemd-networkd systemd-resolved
systemctl start 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 systemctl start knot
# Wait a bit for the keys to propagate # Wait a bit for the keys to propagate
sleep 4 sleep 4
@ -81,7 +87,7 @@ if knotc zone-get test. onlinesign.test. ds | grep .; then
fi fi
# Propagate the new DS records # Propagate the new DS records
while read -ra line; do while read -ra line; do
knotc zone-set test. "${line[@]}" knotc zone-set test. "${line[0]}" 600 "${line[@]:1}"
done < <(keymgr onlinesign.test. ds) done < <(keymgr onlinesign.test. ds)
knotc zone-commit test. knotc zone-commit test.