Skip to content

Commit

Permalink
Merge pull request #12531 from jan-cerny/bootc_bash_remediation_condi…
Browse files Browse the repository at this point in the history
…tions

Add special conditions for bootable containers
  • Loading branch information
Mab879 authored Oct 25, 2024
2 parents 3b3fe36 + 0834570 commit 4804243
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 {{{ bash_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 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 bash_not_bootc_build() -%}}
[[ "$OSCAP_BOOTC_BUILD" != "YES" ]]
{{%- endmacro -%}}

0 comments on commit 4804243

Please sign in to comment.