From 58ba3a02cf44eb07bb2655a3b67caddcf88fea3e Mon Sep 17 00:00:00 2001 From: Israel Villar Boillos Date: Thu, 10 Sep 2026 19:55:01 +0100 Subject: [PATCH 1/3] Set grub2_uefi_boot_path to /boot/grub for debian-like The debian-like override in product_properties/10-grub.yml set grub2_boot_path=/boot/grub but left grub2_uefi_boot_path at the RHEL default /boot/grub2, which does not exist on Debian. As a result the grub2_uefi_password OVAL checked /boot/grub2/grub.cfg and always failed on Debian even with a valid superuser + password_pbkdf2 in /boot/grub/grub.cfg. Ubuntu (also debian-like) already sets /boot/grub for >18.04; move the setting up to the debian-like block so Debian 11/12/13 get it too. The ubuntu block still overrides to /boot/efi/EFI/ubuntu for <=18.04. Co-Authored-By: Claude Sonnet 5 Claude-Session: https://claude.ai/code/session_015YN4ez6hrFpegisiLLo3zx --- product_properties/10-grub.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/product_properties/10-grub.yml b/product_properties/10-grub.yml index b2c17c23356b..a385f3e853da 100644 --- a/product_properties/10-grub.yml +++ b/product_properties/10-grub.yml @@ -20,6 +20,7 @@ overrides: {{% endif %}} {{% if "debian-like" in families %}} grub2_boot_path: "/boot/grub" + grub2_uefi_boot_path: "/boot/grub" grub_helper_executable: "update-grub" {{% endif %}} {{% if "ubuntu" in families %}} From 64a0e25965f7625f50e342f5b12659583cfb4e98 Mon Sep 17 00:00:00 2001 From: Israel Villar Boillos Date: Tue, 15 Sep 2026 21:50:00 +0100 Subject: [PATCH 2/3] tests: update product-stability reference data for grub2_uefi_boot_path The grub2_uefi_boot_path change to /boot/grub for debian-like products (21cf670f4f) was not reflected in the stable-products reference data, causing the CI check to fail. Co-Authored-By: Claude Sonnet 5 Claude-Session: https://claude.ai/code/session_012ARJshBwZJW1AiYFotscgT --- tests/data/product_stability/debian11.yml | 2 +- tests/data/product_stability/debian12.yml | 2 +- tests/data/product_stability/debian13.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/data/product_stability/debian11.yml b/tests/data/product_stability/debian11.yml index ee05237b3b9e..1dff738d53e1 100644 --- a/tests/data/product_stability/debian11.yml +++ b/tests/data/product_stability/debian11.yml @@ -41,7 +41,7 @@ full_name: Debian 11 gid_min: 1000 groups: {} grub2_boot_path: /boot/grub -grub2_uefi_boot_path: /boot/grub2 +grub2_uefi_boot_path: /boot/grub grub_helper_executable: update-grub init_system: systemd login_defs_defaults_path: /usr/etc/login.defs diff --git a/tests/data/product_stability/debian12.yml b/tests/data/product_stability/debian12.yml index 448487d6344e..f1c498381042 100644 --- a/tests/data/product_stability/debian12.yml +++ b/tests/data/product_stability/debian12.yml @@ -41,7 +41,7 @@ full_name: Debian 12 gid_min: 1000 groups: {} grub2_boot_path: /boot/grub -grub2_uefi_boot_path: /boot/grub2 +grub2_uefi_boot_path: /boot/grub grub_helper_executable: update-grub init_system: systemd login_defs_defaults_path: /usr/etc/login.defs diff --git a/tests/data/product_stability/debian13.yml b/tests/data/product_stability/debian13.yml index d54a46da9f09..0478a28d562e 100644 --- a/tests/data/product_stability/debian13.yml +++ b/tests/data/product_stability/debian13.yml @@ -42,7 +42,7 @@ full_name: Debian 13 gid_min: 1000 groups: {} grub2_boot_path: /boot/grub -grub2_uefi_boot_path: /boot/grub2 +grub2_uefi_boot_path: /boot/grub grub_helper_executable: update-grub init_system: systemd login_defs_defaults_path: /usr/etc/login.defs From 97f262ffd9e80f15ffd527af4063daf785d49a57 Mon Sep 17 00:00:00 2001 From: Israel Villar Boillos Date: Tue, 15 Sep 2026 22:49:47 +0100 Subject: [PATCH 3/3] product_properties/10-grub.yml: fix Yaml Lint CI failure The 'CI Lint / Yaml Lint on Changed yaml files' check failed on this PR: the yamllint-preprocessing script only strips the Jinja {{% %}} delimiter lines, not the conditional logic itself, so it sees every mutually-exclusive branch's keys stacked in the same mapping and flags them as duplicates. This file already had that pattern before this PR (rhel-like/suse/ubuntu branches); adding the debian-like grub2_uefi_boot_path override pushed it over into an actual lint error. Suppress the false positive the same way linux_os/guide/.../sshd_disable_compression/rule.yml already does for an analogous case, wrapping the conditional overrides in a yamllint disable/enable rule:key-duplicates pair. Verified: yamllint now reports only pre-existing blank-line warnings (exit 2), no errors (exit 1), matching what the CI job requires to pass. Rebuilt debian11/12/13, ubuntu2404, rhel9 and sle15 and confirmed grub2_boot_path/grub2_uefi_boot_path/grub_helper_executable resolve to the same values as before this fix. Co-Authored-By: Claude Sonnet 5 Claude-Session: https://claude.ai/code/session_012ARJshBwZJW1AiYFotscgT --- product_properties/10-grub.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/product_properties/10-grub.yml b/product_properties/10-grub.yml index a385f3e853da..b941ac9dc0f0 100644 --- a/product_properties/10-grub.yml +++ b/product_properties/10-grub.yml @@ -5,6 +5,7 @@ default: grub_helper_executable: "grubby" overrides: +# yamllint disable rule:key-duplicates {{% if "rhel-like" in families and major_version_ordinal <= 8 %}} {{% if "almalinux" in product %}} grub2_uefi_boot_path: "/boot/efi/EFI/almalinux" @@ -30,3 +31,4 @@ overrides: grub2_uefi_boot_path: "/boot/grub" {{% endif %}} {{% endif %}} +# yamllint enable rule:key-duplicates