fedora-intune: don't repeat the version in the reported OS version
Build containers / fedora-cosmic (44) (pull_request) Canceled after 0s
Build containers / fedora-cosmic (rawhide) (pull_request) Canceled after 0s
Build containers / fedora-remote (44) (pull_request) Canceled after 0s
Build containers / fedora-intune (44) (pull_request) Canceled after 0s
Build containers / Compute changes (pull_request) Canceled after 13s
Build containers / Prune old releases and tags (pull_request) Skipped
Build containers / fedora-cosmic (44) (pull_request) Canceled after 0s
Build containers / fedora-cosmic (rawhide) (pull_request) Canceled after 0s
Build containers / fedora-remote (44) (pull_request) Canceled after 0s
Build containers / fedora-intune (44) (pull_request) Canceled after 0s
Build containers / Compute changes (pull_request) Canceled after 13s
Build containers / Prune old releases and tags (pull_request) Skipped
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) <noreply@anthropic.com>
This commit is contained in:
1 parent
5504f4e7aa
commit
e8cfa8d4cf
1 file changed
+8
-1
@@ -5,16 +5,23 @@
|
|||||||
# "44". Himmelblau reports VERSION_ID as the device's OS version and has no
|
# "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
|
# setting for it. The rest of the system keeps the stock VERSION_ID, which
|
||||||
# toolbox, flatpak and dnf expect to be the plain release.
|
# 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
|
set -euo pipefail
|
||||||
|
|
||||||
SRC=/usr/lib/os-release
|
SRC=/usr/lib/os-release
|
||||||
DEST=/run/himmelblau-os-release
|
DEST=/run/himmelblau-os-release
|
||||||
|
|
||||||
version="$(. "${SRC}" && echo "${OSTREE_VERSION:-${IMAGE_VERSION:-}}")"
|
version="$(. "${SRC}" && echo "${OSTREE_VERSION:-${IMAGE_VERSION:-}}")"
|
||||||
|
name="$(. "${SRC}" && echo "${NAME:-Linux}")"
|
||||||
|
|
||||||
tmp="$(mktemp "${DEST}.XXXXXX")"
|
tmp="$(mktemp "${DEST}.XXXXXX")"
|
||||||
if [[ -n "${version}" ]]; then
|
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
|
else
|
||||||
# No image version (not an ostree/bootc deployment): pass it through as-is.
|
# No image version (not an ostree/bootc deployment): pass it through as-is.
|
||||||
cat "${SRC}" > "${tmp}"
|
cat "${SRC}" > "${tmp}"
|
||||||
|
|||||||
Reference in new issue
Block a user