From e8cfa8d4cf30f07eebc18efc81c682c588ece4ac Mon Sep 17 00:00:00 2001 From: Wesley van Tilburg Date: Tue, 20 Oct 2026 12:45:36 +0000 Subject: [PATCH] fedora-intune: don't repeat the version in the reported OS version libhimmelblau reports "PRETTY_NAME VERSION_ID" as the OS version, and Fedora's PRETTY_NAME already contains the version, so Entra showed "Fedora Linux 44.20261020.0 (Forty Four) 44.20261020.0". In the os-release the Himmelblau daemons see, set PRETTY_NAME to NAME, giving "Fedora Linux 44.20261020.0". Nothing else in Himmelblau reads PRETTY_NAME. Co-Authored-By: Claude Opus 5.5 (1M context) --- images/fedora-intune/files/himmelblau-os-release | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/images/fedora-intune/files/himmelblau-os-release b/images/fedora-intune/files/himmelblau-os-release index 06d015b..ae13aaf 100644 --- a/images/fedora-intune/files/himmelblau-os-release +++ b/images/fedora-intune/files/himmelblau-os-release @@ -5,16 +5,23 @@ # "44". Himmelblau reports VERSION_ID as the device's OS version and has no # setting for it. The rest of the system keeps the stock VERSION_ID, which # toolbox, flatpak and dnf expect to be the plain release. +# +# PRETTY_NAME becomes just NAME: libhimmelblau reports "PRETTY_NAME VERSION_ID" +# as the OS version string, and Fedora's PRETTY_NAME already contains the +# version ("Fedora Linux 44.20261020.0 (Forty Four) 44.20261020.0"). Nothing +# else in Himmelblau reads PRETTY_NAME. set -euo pipefail SRC=/usr/lib/os-release DEST=/run/himmelblau-os-release version="$(. "${SRC}" && echo "${OSTREE_VERSION:-${IMAGE_VERSION:-}}")" +name="$(. "${SRC}" && echo "${NAME:-Linux}")" tmp="$(mktemp "${DEST}.XXXXXX")" if [[ -n "${version}" ]]; then - sed "s/^VERSION_ID=.*/VERSION_ID=${version}/" "${SRC}" > "${tmp}" + sed -e "s/^VERSION_ID=.*/VERSION_ID=${version}/" \ + -e "s/^PRETTY_NAME=.*/PRETTY_NAME=\"${name}\"/" "${SRC}" > "${tmp}" else # No image version (not an ostree/bootc deployment): pass it through as-is. cat "${SRC}" > "${tmp}"