Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stabilization] Fix rule chronyd_or_ntpd_set_maxpoll #11977

Merged
merged 1 commit into from
May 9, 2024
+4 −2
Merged

[stabilization] Fix rule chronyd_or_ntpd_set_maxpoll #11977

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Loading
Loading status checks…
Prioritize chronyd_specify_remote_server 
This change will put chronyd_specify_remote_server before
other rules in the ntp group.

Fixes: #11934
@jan-cerny
jan-cerny committed May 9, 2024
commit a01d2eb6cd267d9f33a9fca249c6f37c338a076f
6 changes: 4 additions & 2 deletions ssg/build_yaml.py
View file
Original file line number Diff line number Diff line change
@@ -692,10 +692,12 @@ def _add_rules_xml(self, group, rules_to_not_include, env_yaml):
r'(service_.*_(enabled|disabled))|' +
r'install_smartcard_packages|' +
r'sshd_set_keepalive(_0)?|' +
r'sshd_set_idle_timeout$')
r'sshd_set_idle_timeout|' +
r'chronyd_specify_remote_server$')
priority_order = ["enable_authselect", "installed", "install_smartcard_packages", "removed",
"enabled", "disabled", "sshd_set_keepalive_0",
"sshd_set_keepalive", "sshd_set_idle_timeout"]
"sshd_set_keepalive", "sshd_set_idle_timeout",
"chronyd_specify_remote_server"]
rules_in_group = reorder_according_to_ordering(rules_in_group, priority_order, regex)

# Add rules in priority order, first all packages installed, then removed,