chore: workaround for rpm-ostreed.conf getting overwritten (#1873)

This commit is contained in:
renner 2026-03-12 06:39:21 +01:00 committed by GitHub
parent a7e985555f
commit 555e893a3a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 1 deletions

View file

@ -286,8 +286,13 @@ dnf5 -y --repo=copr:copr.fedorainfracloud.org:ublue-os:flatpak-test install flat
# dnf5 upgrade --refresh --advisory=FEDORA-2024-dd2e9fb225
#fi
# This can all be removed when
# https://bodhi.fedoraproject.org/updates/FEDORA-2026-b0568b39a2
# made it into our base image
# https://github.com/coreos/rpm-ostree/issues/5567
dnf -y install rpm-ostree-2025.12-1.fc$(rpm -E %fedora)
dnf -y install rpm-ostree-2025.12-1.fc"$(rpm -E %fedora)"
# workaround for https://github.com/coreos/rpm-ostree/issues/5573
cp /ctx/system_files/shared/etc/rpm-ostreed.conf /etc/rpm-ostreed.conf
# Explicitly install KDE Plasma related packages with the same version as in base image
if [[ "${UBLUE_IMAGE_TAG}" == "beta" ]]; then

View file

@ -15,6 +15,9 @@ BACKUP_KEY=$(jq -r '.transports.docker."ghcr.io/ublue-os"[0].keyPaths[1]' /etc/c
KEY1_SHA256="af78ecfda6eb21c35195af3739341715e9cfc3f2f5911dd9c10b0670547bf6e8"
BACKUP_KEY_SHA256="b723467015ba562d40b4645c98c51c65d8254bb59444f6e9962debcfe2315da0"
RPM_OSTREED_CONF_SHA256="f48bb2359e9c31ed464127048138993e2e058bb648e5fd9ba7b7386a2b5eb174"
echo "${RPM_OSTREED_CONF_SHA256} /etc/rpm-ostreed.conf" | sha256sum -c -
echo "${KEY1_SHA256} ${KEY1}" | sha256sum -c -
echo "${BACKUP_KEY_SHA256} ${BACKUP_KEY}" | sha256sum -c -