This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, next has been updated via 95530b3edb1e42eb1a68988272916c033fc2cd57 (commit) via 2234e8aacac2e0d0b06dac4513585c15c2b3b440 (commit) from f62b488f82b5eb6bbbc1b57d90a919d61346ef5f (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 95530b3edb1e42eb1a68988272916c033fc2cd57 Author: Peter Müller peter.mueller@ipfire.org Date: Mon Jun 20 20:44:58 2022 +0000

Core Update 169: Ship NTP configuration changes

Signed-off-by: Peter Müller peter.mueller@ipfire.org

commit 2234e8aacac2e0d0b06dac4513585c15c2b3b440 Author: Jon Murphy jon.murphy@ipfire.org Date: Thu May 26 19:40:31 2022 -0500

Ship NTP changes

- Device time more accurate. (e.g., +/- 10 seconds per day to < 100 ms on some devices) ( I know we don't need the perfect time server ) - NTP and time will be accurate in manual mode (setting on Time Server > NTP Configuration WebGUI) - Change NTP "prefer" server: - The current preferred NTP server in an Undisciplined Local Clock. - This is intended when no outside source of synchronized time is available. - Change the "prefer" server from 127.127.1.0 to the Primary NTP server specified on the Time Server > NTP Configuration WebGUI page. - Change allows the drift file (located at /etc/ntp/drift) to be populated by ntpd. - The drift file is updated about once per hour which helps correct the device time.

Signed-off-by: Jon Murphy jon.murphy@ipfire.org

-----------------------------------------------------------------------

Summary of changes: config/ntp/ntp.conf | 3 ++- config/rootfiles/core/169/filelists/files | 2 ++ src/initscripts/system/ntp | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-)

Difference in files: diff --git a/config/ntp/ntp.conf b/config/ntp/ntp.conf index 9e393ca8e..bcaf2ee9e 100644 --- a/config/ntp/ntp.conf +++ b/config/ntp/ntp.conf @@ -1,6 +1,7 @@ disable monitor restrict default nomodify noquery restrict 127.0.0.1 -server 127.127.1.0 prefer +server 127.127.1.0 fudge 127.127.1.0 stratum 10 driftfile /etc/ntp/drift +includefile /etc/ntp/ntpInclude.conf diff --git a/config/rootfiles/core/169/filelists/files b/config/rootfiles/core/169/filelists/files index 3b80f1385..44a68f28e 100644 --- a/config/rootfiles/core/169/filelists/files +++ b/config/rootfiles/core/169/filelists/files @@ -1,11 +1,13 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf +etc/ntp.conf etc/rc.d/helper/aws-setup etc/rc.d/helper/azure-setup etc/rc.d/helper/exoscale-setup etc/rc.d/helper/gcp-setup etc/rc.d/helper/oci-setup etc/rc.d/init.d/localnet +etc/rc.d/init.d/ntp etc/sysctl.conf lib/firmware/amdgpu/aldebaran_mec2.bin lib/firmware/amdgpu/aldebaran_mec.bin diff --git a/src/initscripts/system/ntp b/src/initscripts/system/ntp index 74b8bc86a..6c8174d25 100644 --- a/src/initscripts/system/ntp +++ b/src/initscripts/system/ntp @@ -52,6 +52,8 @@ case "$1" in fi fi

+ echo -e "server ${NTP_ADDR_1} prefer\nserver ${NTP_ADDR_2}" > /etc/ntp/ntpInclude.conf + boot_mesg "Starting ntpd..." loadproc /usr/bin/ntpd -Ap /var/run/ntpd.pid ;;

hooks/post-receive -- IPFire 2.x development tree