|
 |
9bae83f |
From: Robert Fairley <rfairley@redhat.com>
|
|
|
9bae83f |
Date: Wed, 17 Jun 2020 10:14:19 -0400
|
|
 |
ba7e409 |
Subject: [PATCH] examples/nm-dispatcher.dhcp: use sysconfig
|
|
|
9bae83f |
|
|
|
9bae83f |
Use the PEERNTP and NTPSERVERARGS environment variables from
|
|
|
ba7e409 |
/etc/sysconfig/network{-scripts}.
|
|
 |
7f89c46 |
|
|
|
7f89c46 |
Co-Authored-By: Christian Glombek <cglombek@redhat.com>
|
|
|
9bae83f |
|
|
|
9bae83f |
diff --git a/examples/chrony.nm-dispatcher.dhcp b/examples/chrony.nm-dispatcher.dhcp
|
|
|
7f89c46 |
index 6ea4c37..a6ad35a 100644
|
|
|
9bae83f |
--- a/examples/chrony.nm-dispatcher.dhcp
|
|
|
9bae83f |
+++ b/examples/chrony.nm-dispatcher.dhcp
|
|
|
33529ab |
@@ -8,15 +8,23 @@ export LC_ALL=C
|
|
|
33529ab |
interface=$1
|
|
|
33529ab |
action=$2
|
|
|
9bae83f |
|
|
|
33529ab |
+[ -f /etc/sysconfig/network ] && . /etc/sysconfig/network
|
|
|
33529ab |
+[ -f /etc/sysconfig/network-scripts/ifcfg-"${interface}" ] && \
|
|
|
33529ab |
+ . /etc/sysconfig/network-scripts/ifcfg-"${interface}"
|
|
|
33529ab |
+
|
|
|
7f89c46 |
chronyc=/usr/bin/chronyc
|
|
|
33529ab |
-server_options=iburst
|
|
|
7f89c46 |
-server_dir=/var/run/chrony-dhcp
|
|
|
33529ab |
+server_options=${NTPSERVERARGS:-iburst}
|
|
|
7f89c46 |
+server_dir=/run/chrony-dhcp
|
|
|
7f89c46 |
|
|
|
7f89c46 |
dhcp_server_file=$server_dir/$interface.sources
|
|
|
33529ab |
dhcp_ntp_servers="$DHCP4_NTP_SERVERS $DHCP6_DHCP6_NTP_SERVERS"
|
|
|
9bae83f |
|
|
|
9bae83f |
add_servers_from_dhcp() {
|
|
|
9bae83f |
rm -f "$dhcp_server_file"
|
|
|
9bae83f |
+
|
|
|
9bae83f |
+ # Don't add NTP servers if PEERNTP=no specified; return early.
|
|
|
9bae83f |
+ [ "$PEERNTP" = "no" ] && return
|
|
|
9bae83f |
+
|
|
|
33529ab |
for server in $dhcp_ntp_servers; do
|
|
|
33529ab |
# Check for invalid characters (from the DHCPv6 NTP FQDN suboption)
|
|
|
7a0122b |
len1=$(printf '%s' "$server" | wc -c)
|