From 1f25b896195c28b6c992a2d495ca538c489d99e9 Mon Sep 17 00:00:00 2001 From: Sam Wouters <231222691+swoutersup@users.noreply.github.com> Date: Wed, 15 Jul 2026 18:19:41 +0200 Subject: [PATCH] Extend product-in sed to cover shared/, not-in, and single quotes Same gap as a9/a10: the sed only searched linux_os/ and only matched double-quoted product names in 'if product in' blocks, missing rules in shared/, exclusion lists using 'if product not in', and single-quoted product names in either form. Extend the find path to linux_os/ and shared/, and add the three missing -e expressions to cover all four combinations. --- files/add-almalinux8-support.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/files/add-almalinux8-support.sh b/files/add-almalinux8-support.sh index 12e00af..91161e9 100644 --- a/files/add-almalinux8-support.sh +++ b/files/add-almalinux8-support.sh @@ -44,8 +44,11 @@ find ./shared -type f -exec sed -i \ # silently falls through to the generic `else` branch of those rules (e.g. # configure_custom_crypto_policy_cis drops NO-SSHWEAKCIPHERS/NO-SSHWEAKMACS/ # NO-WEAKMAC, weakening the CIS crypto remediation versus the rhel8 base). -find ./linux_os -type d -name ensure_redhat_gpgkey_installed -prune -o -type f -exec sed -i \ - -e '/if product in/ s/"rhel8"/"rhel8", "almalinux8"/g' {} \; +find ./linux_os ./shared -type d -name ensure_redhat_gpgkey_installed -prune -o -type f -exec sed -i \ + -e '/if product in/ s/"rhel8"/"rhel8", "almalinux8"/g' \ + -e "/if product in/ s/'rhel8'/'rhel8', 'almalinux8'/g" \ + -e '/if product not in/ s/"rhel8"/"rhel8", "almalinux8"/g' \ + -e "/if product not in/ s/'rhel8'/'rhel8', 'almalinux8'/g" {} \; find ./linux_os ./shared -type d -name ensure_redhat_gpgkey_installed -prune -o -type f -exec sed -i -E \ -e 's/product == (["'\''])rhel8\1/(product == \1rhel8\1 or product == \1almalinux8\1)/g' {} \;