From 7d9e669efa3ad66c57cd8d618b1f85f1d4fee4a9 Mon Sep 17 00:00:00 2001 From: Alan Moore Date: Wed, 9 Sep 2026 12:00:09 +0100 Subject: [PATCH 1/4] Fix sed in chronyd_server_directive tests/ Signed-off-by: Alan Moore --- .../ntp/chronyd_server_directive/tests/multiple_servers.pass.sh | 2 +- .../ntp/chronyd_server_directive/tests/only_pool.fail.sh | 2 +- .../ntp/chronyd_server_directive/tests/only_server.pass.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/linux_os/guide/services/ntp/chronyd_server_directive/tests/multiple_servers.pass.sh b/linux_os/guide/services/ntp/chronyd_server_directive/tests/multiple_servers.pass.sh index 95e25bf24311..668a1a00daca 100644 --- a/linux_os/guide/services/ntp/chronyd_server_directive/tests/multiple_servers.pass.sh +++ b/linux_os/guide/services/ntp/chronyd_server_directive/tests/multiple_servers.pass.sh @@ -2,6 +2,6 @@ # packages = chrony # platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_ubuntu -sed -i "^pool.*" {{{ chrony_conf_path }}} +sed -i '/^pool.*/d' {{{ chrony_conf_path }}} echo "server 0.pool.ntp.org" > {{{ chrony_conf_path }}} echo "server 1.pool.ntp.org" >> {{{ chrony_conf_path }}} diff --git a/linux_os/guide/services/ntp/chronyd_server_directive/tests/only_pool.fail.sh b/linux_os/guide/services/ntp/chronyd_server_directive/tests/only_pool.fail.sh index f82beaeebeeb..9931db36c37d 100644 --- a/linux_os/guide/services/ntp/chronyd_server_directive/tests/only_pool.fail.sh +++ b/linux_os/guide/services/ntp/chronyd_server_directive/tests/only_pool.fail.sh @@ -3,7 +3,7 @@ # platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_ubuntu # remediation = none -sed -i "^server.*" {{{ chrony_conf_path }}} +sed -i '/^server.*/d' {{{ chrony_conf_path }}} if ! grep "^pool.*" {{{ chrony_conf_path }}}; then echo "pool 0.pool.ntp.org" > {{{ chrony_conf_path }}} fi diff --git a/linux_os/guide/services/ntp/chronyd_server_directive/tests/only_server.pass.sh b/linux_os/guide/services/ntp/chronyd_server_directive/tests/only_server.pass.sh index 5a48ff6c83b2..b2e01522cb20 100644 --- a/linux_os/guide/services/ntp/chronyd_server_directive/tests/only_server.pass.sh +++ b/linux_os/guide/services/ntp/chronyd_server_directive/tests/only_server.pass.sh @@ -2,5 +2,5 @@ # packages = chrony # platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_ubuntu -sed -i "^pool.*" {{{ chrony_conf_path }}} +sed -i '/^pool.*/d' {{{ chrony_conf_path }}} echo "server 0.pool.ntp.org" > {{{ chrony_conf_path }}} From c7ca395bf08ddfc1dfe25644a73d577e4f7a5130 Mon Sep 17 00:00:00 2001 From: Alan Moore Date: Wed, 9 Sep 2026 12:00:54 +0100 Subject: [PATCH 2/4] Add mixed pool and server entries test case for chronyd_server_directive Signed-off-by: Alan Moore --- .../ntp/chronyd_server_directive/tests/mixed.fail.sh | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 linux_os/guide/services/ntp/chronyd_server_directive/tests/mixed.fail.sh diff --git a/linux_os/guide/services/ntp/chronyd_server_directive/tests/mixed.fail.sh b/linux_os/guide/services/ntp/chronyd_server_directive/tests/mixed.fail.sh new file mode 100644 index 000000000000..dc4e20b4bb03 --- /dev/null +++ b/linux_os/guide/services/ntp/chronyd_server_directive/tests/mixed.fail.sh @@ -0,0 +1,6 @@ +#!/bin/bash +# packages = chrony +# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_ubuntu + +echo "pool 0.pool.ntp.org" > {{{ chrony_conf_path }}} +echo "server 0.pool.ntp.org" >> {{{ chrony_conf_path }}} From 69de3ea4f0d14cc44509d78a6663481496e7c5ff Mon Sep 17 00:00:00 2001 From: Alan Moore Date: Wed, 9 Sep 2026 12:01:39 +0100 Subject: [PATCH 3/4] Fix oval regex Signed-off-by: Alan Moore --- .../guide/services/ntp/chronyd_server_directive/oval/shared.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux_os/guide/services/ntp/chronyd_server_directive/oval/shared.xml b/linux_os/guide/services/ntp/chronyd_server_directive/oval/shared.xml index a5707ef542eb..a65b3b19286f 100644 --- a/linux_os/guide/services/ntp/chronyd_server_directive/oval/shared.xml +++ b/linux_os/guide/services/ntp/chronyd_server_directive/oval/shared.xml @@ -29,7 +29,7 @@ {{{ filepath_regex }}} - ^[\s]+pool.*$ + ^[\s]*pool.*$ 1 From c4db6a4e232c6eee1c84b786232f4669017f3aa7 Mon Sep 17 00:00:00 2001 From: Alan Moore Date: Fri, 11 Sep 2026 12:37:08 +0100 Subject: [PATCH 4/4] Suppress warning Signed-off-by: Alan Moore --- .../services/ntp/chronyd_server_directive/tests/mixed.fail.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/linux_os/guide/services/ntp/chronyd_server_directive/tests/mixed.fail.sh b/linux_os/guide/services/ntp/chronyd_server_directive/tests/mixed.fail.sh index dc4e20b4bb03..cfbe3d5fc2dd 100644 --- a/linux_os/guide/services/ntp/chronyd_server_directive/tests/mixed.fail.sh +++ b/linux_os/guide/services/ntp/chronyd_server_directive/tests/mixed.fail.sh @@ -1,6 +1,7 @@ #!/bin/bash # packages = chrony # platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_ubuntu +# remediation = none echo "pool 0.pool.ntp.org" > {{{ chrony_conf_path }}} echo "server 0.pool.ntp.org" >> {{{ chrony_conf_path }}}