Skip to content

Commit

Permalink
manifest: Include systemd-resolved for F33 change
Browse files Browse the repository at this point in the history
This PR adds the systemd-resolved packages into FCOS. It is going to be used by
default in Fedora 33 per this change request:
https://fedoraproject.org/wiki/Changes/systemd-resolved

Adding the systemd-resolved packages back in gets us ready for this change.
It won't impact how DNS is configured or used and it lets users get ready for
the change in Fedora 33.
  • Loading branch information
jdoss authored and dustymabe committed Sep 24, 2020
1 parent f4bbd88 commit 0676ea5
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
3 changes: 0 additions & 3 deletions manifests/fedora-coreos-base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
7 changes: 5 additions & 2 deletions tests/kola/misc-ro
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,11 @@ get_journal_msg_timestamp() {
| jq -r --slurp '.[0]["__MONOTONIC_TIMESTAMP"]'
}

systemctl is-enabled logrotate.service
ok logrotate
for unit in logrotate systemd-resolved; do
if ! systemctl is-enabled ${unit}; then
fatal "Unit ${unit} should be enabled"
fi
done

# https://github.com/coreos/fedora-coreos-config/commit/2a5c2abc796ac645d705700bf445b50d4cda8f5f
if ip link | grep -o -e " eth[0-9]:"; then
Expand Down

0 comments on commit 0676ea5

Please sign in to comment.