|
 |
fd6d13 |
From: Robert Fairley <rfairley@redhat.com>
|
|
|
fd6d13 |
Date: Wed, 17 Jun 2020 10:14:19 -0400
|
|
|
fd6d13 |
Subject: [PATCH] examples/nm-dispatcher.dhcp: use sysconfig
|
|
|
fd6d13 |
|
|
|
fd6d13 |
Use the PEERNTP and NTPSERVERARGS environment variables from
|
|
|
fd6d13 |
/etc/sysconfig/network{-scripts}.
|
|
|
fd6d13 |
|
|
|
fd6d13 |
Co-Authored-By: Christian Glombek <cglombek@redhat.com>
|
|
|
fd6d13 |
|
|
|
fd6d13 |
diff --git a/examples/chrony.nm-dispatcher.dhcp b/examples/chrony.nm-dispatcher.dhcp
|
|
|
fd6d13 |
index 6ea4c37..a6ad35a 100644
|
|
|
fd6d13 |
--- a/examples/chrony.nm-dispatcher.dhcp
|
|
|
fd6d13 |
+++ b/examples/chrony.nm-dispatcher.dhcp
|
|
|
fd6d13 |
@@ -6,16 +6,24 @@
|
|
|
fd6d13 |
|
|
|
fd6d13 |
chronyc=/usr/bin/chronyc
|
|
|
fd6d13 |
default_server_options=iburst
|
|
|
fd6d13 |
-server_dir=/var/run/chrony-dhcp
|
|
|
fd6d13 |
+server_dir=/run/chrony-dhcp
|
|
|
fd6d13 |
|
|
|
fd6d13 |
dhcp_server_file=$server_dir/$interface.sources
|
|
|
fd6d13 |
# DHCP4_NTP_SERVERS is passed from DHCP options by NetworkManager.
|
|
|
fd6d13 |
nm_dhcp_servers=$DHCP4_NTP_SERVERS
|
|
|
fd6d13 |
|
|
|
fd6d13 |
+[ -f /etc/sysconfig/network ] && . /etc/sysconfig/network
|
|
|
fd6d13 |
+[ -f /etc/sysconfig/network-scripts/ifcfg-"${interface}" ] && \
|
|
|
fd6d13 |
+ . /etc/sysconfig/network-scripts/ifcfg-"${interface}"
|
|
|
fd6d13 |
+
|
|
|
fd6d13 |
add_servers_from_dhcp() {
|
|
|
fd6d13 |
rm -f "$dhcp_server_file"
|
|
|
fd6d13 |
+
|
|
|
fd6d13 |
+ # Don't add NTP servers if PEERNTP=no specified; return early.
|
|
|
fd6d13 |
+ [ "$PEERNTP" = "no" ] && return
|
|
|
fd6d13 |
+
|
|
|
fd6d13 |
for server in $nm_dhcp_servers; do
|
|
|
fd6d13 |
- echo "server $server $default_server_options" >> "$dhcp_server_file"
|
|
|
fd6d13 |
+ echo "server $server ${NTPSERVERARGS:-$default_server_options}" >> "$dhcp_server_file"
|
|
|
fd6d13 |
done
|
|
|
fd6d13 |
$chronyc reload sources > /dev/null 2>&1 || :
|
|
|
fd6d13 |
}
|
|
|
fd6d13 |
--
|
|
|
fd6d13 |
2.29.2
|
|
|
fd6d13 |
|