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 9d29a52d7d0d0d7db2cb957fbb628b943bba40aa (commit) via ef7b7b1af8c32bad066ab35dbeabbd3a47d89b4b (commit) via d941effbcfd3344aa244c3f8550fe72bb21af8db (commit) via 4e49d67990b8509d12114f868d48469d41e4b06a (commit) from e1f7cc9077411dac342436441a4ea1a818f80b05 (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 9d29a52d7d0d0d7db2cb957fbb628b943bba40aa Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Oct 30 15:11:05 2020 +0000
core153: Ship NTP changes
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit ef7b7b1af8c32bad066ab35dbeabbd3a47d89b4b Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Oct 30 15:09:50 2020 +0000
ntp: Allow CLI tools to talk to ntpd
Fixes: #12518 Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit d941effbcfd3344aa244c3f8550fe72bb21af8db Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Oct 30 15:08:55 2020 +0000
ntp: Make /etc/ntp owned by root
This is required for ntpd being able to write its own drift file
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 4e49d67990b8509d12114f868d48469d41e4b06a Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Oct 30 15:07:26 2020 +0000
ntp: Move configuration into an own file
We should not write files like that in the LFS scripts.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/ntp/ntp.conf | 6 ++++++ config/rootfiles/core/153/filelists/files | 1 + config/rootfiles/core/153/update.sh | 3 +++ lfs/ntp | 7 +------ 4 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 config/ntp/ntp.conf
Difference in files: diff --git a/config/ntp/ntp.conf b/config/ntp/ntp.conf new file mode 100644 index 000000000..9e393ca8e --- /dev/null +++ b/config/ntp/ntp.conf @@ -0,0 +1,6 @@ +disable monitor +restrict default nomodify noquery +restrict 127.0.0.1 +server 127.127.1.0 prefer +fudge 127.127.1.0 stratum 10 +driftfile /etc/ntp/drift diff --git a/config/rootfiles/core/153/filelists/files b/config/rootfiles/core/153/filelists/files index ef3d556e2..619855ad4 100644 --- a/config/rootfiles/core/153/filelists/files +++ b/config/rootfiles/core/153/filelists/files @@ -1,4 +1,5 @@ etc/issue +etc/ntp.conf etc/os-release etc/system-release srv/web/ipfire/cgi-bin/credits.cgi diff --git a/config/rootfiles/core/153/update.sh b/config/rootfiles/core/153/update.sh index 68d1513aa..4a9b0a246 100644 --- a/config/rootfiles/core/153/update.sh +++ b/config/rootfiles/core/153/update.sh @@ -41,6 +41,9 @@ extract_files # update linker config ldconfig
+# Update permissions +chown -vR root:root /etc/ntp + # Update Language cache #/usr/local/bin/update-lang-cache
diff --git a/lfs/ntp b/lfs/ntp index 3c4a97033..c8f69039d 100644 --- a/lfs/ntp +++ b/lfs/ntp @@ -82,12 +82,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && make install
-mkdir /etc/ntp - chown -R ntp:ntp /etc/ntp - echo "disable monitor" > /etc/ntp.conf - echo "restrict default nomodify noquery" >> /etc/ntp.conf - echo "server 127.127.1.0 prefer" >> /etc/ntp.conf - echo "fudge 127.127.1.0 stratum 10" >> /etc/ntp.conf - echo "driftfile /etc/ntp/drift" >> /etc/ntp.conf + install -v -m 644 $(DIR_SRC)/config/ntp/ntp.conf /etc/ntp.conf
#Enable it by default... cp -vf $(DIR_SRC)/config/time/* /var/ipfire/time/
hooks/post-receive -- IPFire 2.x development tree