Add special conditions for bootable containers #12531
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.
|
Start a new ephemeral environment with changes proposed in this pull request: rhel8 (from CTF) Environment (using Fedora as testing environment) Fedora Testing Environment Oracle Linux 8 Environment |
|
This datastream diff is auto generated by the check Click here to see the full diffbash remediation for rule 'xccdf_org.ssgproject.content_rule_disable_ctrlaltdel_reboot' differs.
--- xccdf_org.ssgproject.content_rule_disable_ctrlaltdel_reboot
+++ xccdf_org.ssgproject.content_rule_disable_ctrlaltdel_reboot
@@ -1,8 +1,13 @@
# Remediation is applicable only in certain platforms
if rpm --quiet -q kernel; then
-systemctl disable --now ctrl-alt-del.target
-systemctl mask --now ctrl-alt-del.target
+if [[ "$OSCAP_BOOTC_BUILD" == "YES" ]] ; 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
else
>&2 echo 'Remediation is not applicable, nothing was done' |
|
/retest |
Mab879
reviewed
Oct 24, 2024
shared/macros/10-bash.jinja
Outdated
| 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() -%}} |
|
I have add |
|
Code Climate has analyzed commit 0834570 and detected 0 issues on this pull request. The test coverage on the diff in this pull request is 100.0% (50% is the threshold). This pull request will bring the total coverage in the repository to 60.9% (0.0% change). View more on Code Climate. |
|
/retest |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit adds 2 new Jinja macros:
bootc_buildandnot_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.The code relies on new OpenSCAP feature implemented in OpenSCAP/openscap#2170.
This commit changes the Bash remediation in rule
disable_ctrlaltdel_rebootto demonstrate usefulness of the new macros.