Skip to content

Commit

Permalink
Add special conditions for bootable containers
Browse files Browse the repository at this point in the history
This commit adds 2 new Jinja macros: `bootc_build` and
`not_bootc_build`.  These macros define Bash conditional expressions
that are evaluated as true or false if the remediation is performed
during a build of a bootable container image or not performed during a
build of a bootable container image. These macros can be used in Bash
remediation code.  They can be used to control the remediation behavior
in the bootable container build environment.

This commit changes the Bash remediation in rule
`disable_ctrlaltdel_reboot` to demonstrate usefulness of the new macros.
  • Loading branch information
jan-cerny committed Oct 23, 2024
1 parent c455adf commit ded83b3
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 2 deletions.
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# platform = multi_platform_all
systemctl disable --now ctrl-alt-del.target
systemctl mask --now ctrl-alt-del.target
if {{{ bootc_build() }}} ; then
systemctl disable ctrl-alt-del.target
systemctl mask ctrl-alt-del.target
else
systemctl disable --now ctrl-alt-del.target
systemctl mask --now ctrl-alt-del.target
fi
16 changes: 16 additions & 0 deletions shared/macros/10-bash.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -2517,3 +2517,19 @@ mkdir -p /etc/dconf/db/{{{ database }}}.d
chmod -R u=rwX,go=rX /etc/dconf/profile
(umask 0022 && dconf update)
{{%- endmacro -%}}

{{#
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() -%}}
[[ "$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() -%}}
[[ "$OSCAP_BOOTC_BUILD" != "YES" ]]
{{%- endmacro -%}}

0 comments on commit ded83b3

Please sign in to comment.