From f281e75cf8d53c8734441b35e77f4cf2a9bb1459 Mon Sep 17 00:00:00 2001 From: Vojtech Polasek Date: Mon, 15 Jul 2024 18:01:43 +0200 Subject: [PATCH 1/2] templates: add rhel10 to conditional macros where rhel9 is mentioned --- shared/templates/grub2_bootloader_argument/oval.template | 2 +- shared/templates/grub2_bootloader_argument_absent/oval.template | 2 +- shared/templates/sebool/ansible.template | 2 +- shared/templates/sebool/bash.template | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/shared/templates/grub2_bootloader_argument/oval.template b/shared/templates/grub2_bootloader_argument/oval.template index 416bfc1d317..ad009ba751b 100644 --- a/shared/templates/grub2_bootloader_argument/oval.template +++ b/shared/templates/grub2_bootloader_argument/oval.template @@ -13,7 +13,7 @@ {{% set system_with_expanded_kernel_options_in_grub_cfg = false -%}} {{% set system_with_bios_and_uefi_support = false -%}} -{{% if product in ["fedora", "ol9", "rhel9"] -%}} +{{% if product in ["fedora", "ol9", "rhel9", "rhel10"] -%}} {{% set system_with_expanded_kernel_options_in_loader_entries = true %}} {{%- endif -%}} diff --git a/shared/templates/grub2_bootloader_argument_absent/oval.template b/shared/templates/grub2_bootloader_argument_absent/oval.template index a65e13b6940..e59b944cbd7 100644 --- a/shared/templates/grub2_bootloader_argument_absent/oval.template +++ b/shared/templates/grub2_bootloader_argument_absent/oval.template @@ -12,7 +12,7 @@ {{% set system_with_expanded_kernel_options_in_grub_cfg = false -%}} {{% set system_with_bios_and_uefi_support = false -%}} -{{% if product in ["ol9", "rhel9"] -%}} +{{% if product in ["ol9", "rhel9", "rhel10"] -%}} {{% set system_with_expanded_kernel_options_in_loader_entries = true %}} {{%- endif -%}} diff --git a/shared/templates/sebool/ansible.template b/shared/templates/sebool/ansible.template index 53a67710f2e..a1733750843 100644 --- a/shared/templates/sebool/ansible.template +++ b/shared/templates/sebool/ansible.template @@ -4,7 +4,7 @@ # complexity = low # disruption = low -{{% if product in ['ol8', 'ol9', 'rhel8', 'rhel9'] %}} +{{% if product in ['ol8', 'ol9', 'rhel8', 'rhel9', 'rhel10'] %}} {{% set PACKAGE_NAME = "python3-libsemanage" %}} {{% elif product == "sle15" %}} {{% set PACKAGE_NAME = "policycoreutils" %}} diff --git a/shared/templates/sebool/bash.template b/shared/templates/sebool/bash.template index 8cf8e262d37..7bc1bd15d35 100644 --- a/shared/templates/sebool/bash.template +++ b/shared/templates/sebool/bash.template @@ -4,7 +4,7 @@ # complexity = low # disruption = low -{{% if product in ['ol8', 'ol9', 'rhel8', 'rhel9'] %}} +{{% if product in ['ol8', 'ol9', 'rhel8', 'rhel9', 'rhel10'] %}} {{{ bash_package_install("python3-libsemanage") }}} {{% elif product == "sle15" %}} {{{ bash_package_install("policycoreutils") }}} From a5260ef4f12e4ab2f6c8f5c8d055587f0da69526 Mon Sep 17 00:00:00 2001 From: Vojtech Polasek Date: Tue, 16 Jul 2024 09:24:49 +0200 Subject: [PATCH 2/2] grub2_bootloader_argument template: make more test scenarios applicable to RHEL 10 --- .../grub2_bootloader_argument/tests/invalid_rescue.pass.sh | 2 +- .../grub2_bootloader_argument/tests/wrong_value_entries.fail.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/shared/templates/grub2_bootloader_argument/tests/invalid_rescue.pass.sh b/shared/templates/grub2_bootloader_argument/tests/invalid_rescue.pass.sh index e84c6e61976..c6d5b6b1bac 100644 --- a/shared/templates/grub2_bootloader_argument/tests/invalid_rescue.pass.sh +++ b/shared/templates/grub2_bootloader_argument/tests/invalid_rescue.pass.sh @@ -1,6 +1,6 @@ #!/bin/bash -# platform = Red Hat Enterprise Linux 9,multi_platform_fedora +# platform = Red Hat Enterprise Linux 9,Red Hat Enterprise Linux 10,multi_platform_fedora # packages = grub2,grubby {{%- if ARG_VARIABLE %}} # variables = {{{ ARG_VARIABLE }}}=correct_value diff --git a/shared/templates/grub2_bootloader_argument/tests/wrong_value_entries.fail.sh b/shared/templates/grub2_bootloader_argument/tests/wrong_value_entries.fail.sh index c827721ef46..f43aa99c49f 100644 --- a/shared/templates/grub2_bootloader_argument/tests/wrong_value_entries.fail.sh +++ b/shared/templates/grub2_bootloader_argument/tests/wrong_value_entries.fail.sh @@ -1,6 +1,6 @@ #!/bin/bash -# platform = Red Hat Enterprise Linux 9,multi_platform_fedora +# platform = Red Hat Enterprise Linux 9,Red Hat Enterprise Linux 10,multi_platform_fedora # packages = grub2,grubby source common.sh