2020-06-26 00:56:53 +00:00
|
|
|
From e0c6457fd42252f88ec60d16582b7b6e6fb04f41 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Robert Fairley <rfairley@redhat.com>
|
|
|
|
|
Date: Wed, 17 Jun 2020 10:14:19 -0400
|
|
|
|
|
Subject: [PATCH] examples/nm-dispatcher.dhcp: use sysconfig, detect dhclient
|
|
|
|
|
|
|
|
|
|
Use the PEERNTP and NTPSERVERARGS environment variables from
|
|
|
|
|
/etc/sysconfig/network{-scripts}. Detect a dhclient install to avoid a
|
|
|
|
|
redundant operation with the 11-dhclient NM dispatcher in the
|
|
|
|
|
dhcp-client package.
|
|
|
|
|
---
|
|
|
|
|
examples/chrony.nm-dispatcher.dhcp | 15 ++++++++++++++-
|
|
|
|
|
1 file changed, 14 insertions(+), 1 deletion(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/examples/chrony.nm-dispatcher.dhcp b/examples/chrony.nm-dispatcher.dhcp
|
|
|
|
|
index 6ea4c37..878e72f 100644
|
|
|
|
|
--- a/examples/chrony.nm-dispatcher.dhcp
|
|
|
|
|
+++ b/examples/chrony.nm-dispatcher.dhcp
|
|
|
|
|
@@ -6,6 +6,11 @@
|
|
|
|
|
|
|
|
|
|
export LC_ALL=C
|
|
|
|
|
|
|
|
|
|
+# If a dhclient installation is present, avoid a redundant operation
|
|
|
|
|
+# with dhclient which handles NTP server config through its own
|
|
|
|
|
+# NetworkManager dispatcher script 11-dhclient.
|
|
|
|
|
+[ -e /usr/sbin/dhclient ] && exit 0
|
|
|
|
|
+
|
|
|
|
|
interface=$1
|
|
|
|
|
action=$2
|
|
|
|
|
|
|
|
|
|
@@ -17,10 +22,18 @@ dhcp_server_file=$server_dir/$interface.sources
|
|
|
|
|
# DHCP4_NTP_SERVERS is passed from DHCP options by NetworkManager.
|
|
|
|
|
nm_dhcp_servers=$DHCP4_NTP_SERVERS
|
|
|
|
|
|
|
|
|
|
+[ -f /etc/sysconfig/network ] && . /etc/sysconfig/network
|
|
|
|
|
+[ -f /etc/sysconfig/network-scripts/ifcfg-"${interface}" ] && \
|
|
|
|
|
+ . /etc/sysconfig/network-scripts/ifcfg-"${interface}"
|
|
|
|
|
+
|
|
|
|
|
add_servers_from_dhcp() {
|
|
|
|
|
rm -f "$dhcp_server_file"
|
|
|
|
|
+
|
|
|
|
|
+ # Don't add NTP servers if PEERNTP=no specified; return early.
|
|
|
|
|
+ [ "$PEERNTP" = "no" ] && return
|
|
|
|
|
+
|
|
|
|
|
for server in $nm_dhcp_servers; do
|
|
|
|
|
- echo "server $server $default_server_options" >> "$dhcp_server_file"
|
|
|
|
|
+ echo "server $server ${NTPSERVERARGS:-$default_server_options}" >> "$dhcp_server_file"
|
|
|
|
|
done
|
|
|
|
|
$chronyc reload sources > /dev/null 2>&1 || :
|
|
|
|
|
}
|
|
|
|
|
--
|
|
|
|
|
2.26.2
|
|
|
|
|
|
2020-08-26 07:30:32 +00:00
|
|
|
diff -up chrony-4.0-pre3/examples/chrony.nm-dispatcher.dhcp.nm-dispatcher-dhcp chrony-4.0-pre3/examples/chrony.nm-dispatcher.dhcp
|
|
|
|
|
--- chrony-4.0-pre3/examples/chrony.nm-dispatcher.dhcp.nm-dispatcher-dhcp 2020-08-26 09:27:47.076282468 +0200
|
|
|
|
|
+++ chrony-4.0-pre3/examples/chrony.nm-dispatcher.dhcp 2020-08-26 09:27:51.847297974 +0200
|
|
|
|
|
@@ -16,7 +16,7 @@ action=$2
|
|
|
|
|
|
|
|
|
|
chronyc=/usr/bin/chronyc
|
|
|
|
|
default_server_options=iburst
|
|
|
|
|
-server_dir=/var/run/chrony-dhcp
|
|
|
|
|
+server_dir=/run/chrony-dhcp
|
|
|
|
|
|
|
|
|
|
dhcp_server_file=$server_dir/$interface.sources
|
|
|
|
|
# DHCP4_NTP_SERVERS is passed from DHCP options by NetworkManager.
|
