Merge pull request #12988 from jan-cerny/change_conditions

OPENSCAP-5220 Change macro bash_bootc_build
ComplianceAsCode · Feb 12, 2025 · 697fa03 · 697fa03
2 parents 7fb2776 + 9c4e7c0
commit 697fa03
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/shared/macros/10-bash.jinja b/shared/macros/10-bash.jinja
@@ -2669,15 +2669,15 @@ This macro defines a conditional expression that is evaluated as true
 if the remediation is performed during a build of a bootable container image.
 #}}
 {{%- macro bash_bootc_build() -%}}
-[[ "$OSCAP_BOOTC_BUILD" == "YES" ]]
+{ rpm --quiet -q kernel rpm-ostree bootc && ! rpm --quiet -q openshift-kubelet && { [ -f "/run/.containerenv" ] || [ -f "/.containerenv" ]; }; }
 {{%- endmacro -%}}
 
 {{#
 This macro defines a conditional expression that is evaluated as true
 if the remediation is not performed during a build of a bootable container image.
 #}}
 {{%- macro bash_not_bootc_build() -%}}
-[[ "$OSCAP_BOOTC_BUILD" != "YES" ]]
+! {{{ bash_bootc_build() }}}
 {{%- endmacro -%}}