diff --git a/files/add-almalinux9-support.sh b/files/add-almalinux9-support.sh index 3b91605..7d3fb6e 100644 --- a/files/add-almalinux9-support.sh +++ b/files/add-almalinux9-support.sh @@ -84,18 +84,10 @@ if [ -d products/almalinux9/overlays ]; then products/almalinux9/overlays/* fi -if [ -d products/almalinux9/controls ]; then - for ctl in $(find products/almalinux9/controls/ -type f -name '*rhel9*'); do - mv "$ctl" "$(echo "$ctl" | sed 's/rhel9/almalinux9/g')" - done - find products/almalinux9/controls -type f -exec sed -i \ - -e 's/Red Hat Enterprise Linux/AlmaLinux OS/g' \ - -e 's/RHEL9/ALMALINUX9/g' \ - -e 's/RHEL-9/ALMALINUX-9/g' \ - -e '/^id:/s/rhel9/almalinux9/g' \ - -e '/^product:/s/rhel9/almalinux9/g' \ - -e 's/ensure_redhat_gpgkey_installed/ensure_almalinux_gpgkey_installed/g' {} \; -fi +# Upstream CaC ships a maintained controls/cis_almalinux9.yml at the top level. +# The product-level copy (mechanically renamed from rhel9) would override it and +# lose AlmaLinux-specific adjustments, so remove it. +rm -fr products/almalinux9/controls sed -i \ -e 's/rhel9/almalinux9/' \