From 79be40627f55fa67271e98c23be946f22a7a0244 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Thu, 24 Aug 2023 11:14:46 +0200 Subject: [PATCH 1/2] Enable fwupd refresh timer on Fedora 39 See: https://fedoraproject.org/wiki/Changes/EnableFwupdRefreshByDefault Fixes: https://github.com/coreos/fedora-coreos-tracker/issues/1512 --- manifests/enable-fwupd-refresh-timer.yaml | 2 ++ manifests/fedora-coreos.yaml | 5 +++++ overlay.d/18fwupd-refresh-timer/statoverride | 2 ++ .../50-fwupd-refresh-timer.preset | 4 ++++ overlay.d/README.md | 9 ++++++++ tests/kola/files/fwupd-refresh-timer | 21 +++++++++++++++++++ 6 files changed, 43 insertions(+) create mode 100644 manifests/enable-fwupd-refresh-timer.yaml create mode 100644 overlay.d/18fwupd-refresh-timer/statoverride create mode 100644 overlay.d/18fwupd-refresh-timer/usr/lib/systemd/system-preset/50-fwupd-refresh-timer.preset create mode 100755 tests/kola/files/fwupd-refresh-timer diff --git a/manifests/enable-fwupd-refresh-timer.yaml b/manifests/enable-fwupd-refresh-timer.yaml new file mode 100644 index 0000000000..79cd710aa5 --- /dev/null +++ b/manifests/enable-fwupd-refresh-timer.yaml @@ -0,0 +1,2 @@ +ostree-layers: + - overlay/18fwupd-refresh-timer diff --git a/manifests/fedora-coreos.yaml b/manifests/fedora-coreos.yaml index a30e010858..59217fc705 100644 --- a/manifests/fedora-coreos.yaml +++ b/manifests/fedora-coreos.yaml @@ -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 diff --git a/overlay.d/18fwupd-refresh-timer/statoverride b/overlay.d/18fwupd-refresh-timer/statoverride new file mode 100644 index 0000000000..27a95affe2 --- /dev/null +++ b/overlay.d/18fwupd-refresh-timer/statoverride @@ -0,0 +1,2 @@ +# Config file for overriding permission bits on overlay files/dirs +# Format: = diff --git a/overlay.d/18fwupd-refresh-timer/usr/lib/systemd/system-preset/50-fwupd-refresh-timer.preset b/overlay.d/18fwupd-refresh-timer/usr/lib/systemd/system-preset/50-fwupd-refresh-timer.preset new file mode 100644 index 0000000000..d6f4bf900c --- /dev/null +++ b/overlay.d/18fwupd-refresh-timer/usr/lib/systemd/system-preset/50-fwupd-refresh-timer.preset @@ -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 diff --git a/overlay.d/README.md b/overlay.d/README.md index ec51984b46..d13b1975a9 100644 --- a/overlay.d/README.md +++ b/overlay.d/README.md @@ -42,6 +42,15 @@ Things that are more closely "Fedora CoreOS": Disable Zincati on non-production streams: https://github.com/coreos/fedora-coreos-tracker/issues/163 +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 ----------------- diff --git a/tests/kola/files/fwupd-refresh-timer b/tests/kola/files/fwupd-refresh-timer new file mode 100755 index 0000000000..8a1b933642 --- /dev/null +++ b/tests/kola/files/fwupd-refresh-timer @@ -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" From cbdb7700e628f9c951956d78c8a34cd452c9685a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Thu, 24 Aug 2023 11:16:00 +0200 Subject: [PATCH 2/2] overlay/README: Update for 17fedora-modularity overlay --- overlay.d/README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/overlay.d/README.md b/overlay.d/README.md index d13b1975a9..eba85e42fc 100644 --- a/overlay.d/README.md +++ b/overlay.d/README.md @@ -42,6 +42,14 @@ 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 ---------------------