Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable fwupd refresh timer on Fedora 39 #2562

Merged
merged 2 commits into from
Aug 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions manifests/enable-fwupd-refresh-timer.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ostree-layers:
- overlay/18fwupd-refresh-timer
5 changes: 5 additions & 0 deletions manifests/fedora-coreos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,11 @@ conditional-include:
# Modularity is going away in F39+ so we'll only include
# the fedora-repos-modular package in <39.
include: fedora-modularity.yaml
- if: releasever >= 39
# https://fedoraproject.org/wiki/Changes/EnableFwupdRefreshByDefault
# Merge with overlay.d/15fcos/usr/lib/systemd/system-preset/45-fcos.preset
# once Fedora 39 is released to all streams
include: enable-fwupd-refresh-timer.yaml

ostree-layers:
- overlay/15fcos
Expand Down
2 changes: 2 additions & 0 deletions overlay.d/18fwupd-refresh-timer/statoverride
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Config file for overriding permission bits on overlay files/dirs
# Format: =<file mode in decimal> <absolute path to a file or directory>
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# https://fedoraproject.org/wiki/Changes/EnableFwupdRefreshByDefault
# As this is for FCOS only for now, once Fedora 39 is released to all streams,
# this should be moved to overlay.d/15fcos/usr/lib/systemd/system-preset/45-fcos.preset
enable fwupd-refresh.timer
travier marked this conversation as resolved.
Show resolved Hide resolved
17 changes: 17 additions & 0 deletions overlay.d/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,23 @@ Things that are more closely "Fedora CoreOS":
Disable Zincati on non-production streams:
https://github.com/coreos/fedora-coreos-tracker/issues/163

17fedora-modularity
-------------------

Check for layered modularity RPMs to warn users of the retirement in Fedora 39
via Console Login Helper Messages.

Remove once Fedora 39 lands in all streams.

18fwupd-refresh-timer
---------------------

Enable fwupd-refresh.timer on Fedora 39:
https://fedoraproject.org/wiki/Changes/EnableFwupdRefreshByDefault

Move to overlay.d/15fcos/usr/lib/systemd/system-preset/45-fcos.preset once
Fedora 39 lands in all streams.

20platform-chrony
-----------------

Expand Down
21 changes: 21 additions & 0 deletions tests/kola/files/fwupd-refresh-timer
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#!/bin/bash
## kola:
## exclusive: false
## description: Verify fwupd-refresh.timer is enabled.
## tags: "platform-independent"

set -xeuo pipefail

# shellcheck disable=SC1091
. "$KOLA_EXT_DATA/commonlib.sh"

if verlt "$(get_fedora_ver)" 39; then
ok "Skipping fwupd-refresh.timer test"
exit 0
fi

unit="fwupd-refresh.timer"
if ! systemctl is-enabled ${unit} 1>/dev/null; then
fatal "Unit ${unit} should be enabled"
fi
ok "Unit ${unit} is enabled as expected"