Prefix bootc macro names with bash

jan-cerny · Oct 25, 2024 · 0834570 · 0834570
1 parent ded83b3
commit 0834570
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/linux_os/guide/system/accounts/accounts-physical/disable_ctrlaltdel_reboot/bash/shared.sh b/linux_os/guide/system/accounts/accounts-physical/disable_ctrlaltdel_reboot/bash/shared.sh
@@ -1,5 +1,5 @@
 # platform = multi_platform_all
-if {{{ bootc_build() }}} ; then
+if {{{ bash_bootc_build() }}} ; then
     systemctl disable ctrl-alt-del.target
     systemctl mask ctrl-alt-del.target
 else

diff --git a/shared/macros/10-bash.jinja b/shared/macros/10-bash.jinja
@@ -2522,14 +2522,14 @@ chmod -R u=rwX,go=rX /etc/dconf/profile
 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 bootc_build() -%}}
+{{%- macro bash_bootc_build() -%}}
 [[ "$OSCAP_BOOTC_BUILD" == "YES" ]]
 {{%- 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 not_bootc_build() -%}}
+{{%- macro bash_not_bootc_build() -%}}
 [[ "$OSCAP_BOOTC_BUILD" != "YES" ]]
 {{%- endmacro -%}}