From 9afa33f09534613936f6c075df131361d1d41568 Mon Sep 17 00:00:00 2001 From: Vojtech Polasek Date: Wed, 23 Mar 2022 09:13:26 +0100 Subject: [PATCH] explicit rule ordering for sshd_set_keepalive* and sshd_set_idle_timeout --- ssg/build_yaml.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ssg/build_yaml.py b/ssg/build_yaml.py index c1de1059a804..3522077955bf 100644 --- a/ssg/build_yaml.py +++ b/ssg/build_yaml.py @@ -1127,9 +1127,12 @@ def to_xml_element(self, env_yaml=None): rules_in_group = list(self.rules.keys()) regex = (r'(package_.*_(installed|removed))|' + r'(service_.*_(enabled|disabled))|' + - r'install_smartcard_packages$') + r'install_smartcard_packages|' + + r'sshd_set_keepalive(_0)?|' + + r'sshd_set_idle_timeout$') priority_order = ["installed", "install_smartcard_packages", "removed", - "enabled", "disabled"] + "enabled", "disabled", "sshd_set_keepalive_0", + "sshd_set_keepalive", "sshd_set_idle_timeout"] rules_in_group = reorder_according_to_ordering(rules_in_group, priority_order, regex) # Add rules in priority order, first all packages installed, then removed,