[stabilization] enable centos-stream-10 in Packit and on Testing Farm
#13491
+24
−20
Conversation
This file contains hidden or 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
Signed-off-by: Jiri Jaburek <comps@nomail.dom>
Signed-off-by: Jiri Jaburek <comps@nomail.dom>
The original code was really buggy: - it relied on a *running* ntpd process to signify whether ntpd or chronyd is used (presumably) - it was a copy/paste from (likely) some maxpoll code, inheriting its comment and 'grep -v' check, likely breaking the config on repeated remediation So I simply rewrote it to just detect the presence of files or the chrony.d directory, and if found, to do the modification. I also avoid re-reading all the files via bash line iteration and just let 'sed' do all the work. Signed-off-by: Jiri Jaburek <comps@nomail.dom>
|
This datastream diff is auto generated by the check Click here to see the full diffbash remediation for rule 'xccdf_org.ssgproject.content_rule_chrony_set_nts' differs.
--- xccdf_org.ssgproject.content_rule_chrony_set_nts
+++ xccdf_org.ssgproject.content_rule_chrony_set_nts
@@ -1,23 +1,22 @@
# Remediation is applicable only in certain platforms
if rpm --quiet -q kernel || rpm --quiet -q kernel-uek && { rpm --quiet -q chrony; }; then
-pof="/usr/sbin/pidof"
+config_files=(/etc/ntp.conf)
+config_files+=("/etc/chrony.conf")
+chrony_d_path=/etc/chrony.d/
+if [[ -d $chrony_d_path ]]; then
+ while IFS= read -r filename; do
+ config_files+=("$filename")
+ done < <(find "$chrony_d_path" -type f -name '*.conf')
+fi
-CONFIG_FILES="/etc/ntp.conf"
-$pof ntpd || {
- CHRONY_D_PATH=/etc/chrony.d/
- mapfile -t CONFIG_FILES < <(find ${CHRONY_D_PATH}.* -type f -name '*.conf')
- CONFIG_FILES+=(/etc/chrony.conf)
-}
-
-# get list of ntp files
-
-for config_file in "${CONFIG_FILES[@]}" ; do
- # Add maxpoll to server, pool or peer entries without maxpoll
- grep "^\(server\|pool\|peer\)" "$config_file" | grep -v maxpoll | while read -r line ; do
- sed -i "s/$line/& nts/" "$config_file"
- done
+for config_file in "${config_files[@]}"; do
+ [[ -e $config_file ]] || continue
+ # if the line doesn't start with 'server/pool/peer ', just print it
+ # if the line does contain ' nts' already, skip it
+ # else append ' nts' to it
+ sed "/^\(server\|pool\|peer\) /! b; / nts/ b; s/$/ nts/" -i "$config_file"
done
else |
Collaborator
|
/packit retest-failed |
vojtapolasek
approved these changes
May 22, 2025
Collaborator
vojtapolasek
left a comment
vojtapolasek
left a comment
There was a problem hiding this comment.
LGTM.
Automatus tests fail because the rule is included in RHEL 10 only and Automatus does not run on this distro.
Centos-stream 9 testing farm test is currently broken because of problems with repo mirrors.
vojtapolasek
merged commit 746d002
into
ComplianceAsCode:stabilization-v0.1.77
107 of 116 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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 is #13479 backported to
stabilization-v0.1.77.