diff --git a/manifests/fedora-coreos-base.yaml b/manifests/fedora-coreos-base.yaml index 9c612a17ca..d70a82389e 100644 --- a/manifests/fedora-coreos-base.yaml +++ b/manifests/fedora-coreos-base.yaml @@ -41,9 +41,6 @@ check-groups: default-target: multi-user.target remove-from-packages: - # We're not using resolved yet. - - [systemd, /usr/lib/systemd/systemd-resolved, - /usr/lib/systemd/system/systemd-resolved.service] # We're not using networkd. - [systemd, /etc/systemd/networkd.conf, /usr/lib/systemd/systemd-networkd, diff --git a/tests/kola/misc-ro b/tests/kola/misc-ro index 14df8f5a85..868b460b1e 100755 --- a/tests/kola/misc-ro +++ b/tests/kola/misc-ro @@ -20,8 +20,25 @@ get_journal_msg_timestamp() { | jq -r --slurp '.[0]["__MONOTONIC_TIMESTAMP"]' } -systemctl is-enabled logrotate.service -ok logrotate +# Test some services are enabled or disabled appropriately +for unit in logrotate; do + if ! systemctl is-enabled ${unit} 1>/dev/null; then + fatal "Unit ${unit} should be enabled" + fi +done +# systemd-resolved should be disabled on f32 but +# enabled on f33+. +source /etc/os-release +if systemctl is-enabled systemd-resolved 1>/dev/null; then + if [ "$VERSION_ID" == "32" ]; then + fatal "Unit ${unit} should not be enabled" + fi +else + if [ "$VERSION_ID" != "32" ]; then + fatal "Unit ${unit} should be enabled" + fi +fi +ok services # https://github.com/coreos/fedora-coreos-config/commit/2a5c2abc796ac645d705700bf445b50d4cda8f5f if ip link | grep -o -e " eth[0-9]:"; then