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 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..cfbe3d5fc2dd --- /dev/null +++ b/linux_os/guide/services/ntp/chronyd_server_directive/tests/mixed.fail.sh @@ -0,0 +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 }}} 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 }}}