rpms/chrony
7
0
Fork 0
Code Issues Pull Requests Releases Activity
90ef1216ea
chrony/chrony-nm-dispatcher-dhcp.patch

44 lines
1.4 KiB
Diff
Raw Normal View History

patch DHCP NM dispatcher for distribution Patch the upstream example `nm-dispatcher.dhcp` with Fedora/RHEL-specific behavior including exiting if a dhclient install is detected, and using the /etc/sysconfig paths. Originally part of work for fixing integration between the NetworkManager internal DHCP client and chrony: https://bugzilla.redhat.com/show_bug.cgi?id=1800901
2020-06-26 00:56:53 +00:00
From: Robert Fairley <rfairley@redhat.com>
Date: Wed, 17 Jun 2020 10:14:19 -0400
rework NM-dispatcher/dhclient detection The packaged NM dispatcher and dhclient scripts provide the same functionality. Only one should be active depending on the system configuration. Instead of guessing in the NM dispatcher script whether the dhclient script is executed, check in the dhclient script whether it is called from a NM dispatcher script (the 11-dhclient script included in the dhcp-client package). This is simpler and it removes dependency on the 11-dhclient script.
2021-04-22 10:32:13 +00:00
Subject: [PATCH] examples/nm-dispatcher.dhcp: use sysconfig
patch DHCP NM dispatcher for distribution Patch the upstream example `nm-dispatcher.dhcp` with Fedora/RHEL-specific behavior including exiting if a dhclient install is detected, and using the /etc/sysconfig paths. Originally part of work for fixing integration between the NetworkManager internal DHCP client and chrony: https://bugzilla.redhat.com/show_bug.cgi?id=1800901
2020-06-26 00:56:53 +00:00
Use the PEERNTP and NTPSERVERARGS environment variables from
rework NM-dispatcher/dhclient detection The packaged NM dispatcher and dhclient scripts provide the same functionality. Only one should be active depending on the system configuration. Instead of guessing in the NM dispatcher script whether the dhclient script is executed, check in the dhclient script whether it is called from a NM dispatcher script (the 11-dhclient script included in the dhcp-client package). This is simpler and it removes dependency on the 11-dhclient script.
2021-04-22 10:32:13 +00:00
/etc/sysconfig/network{-scripts}.
update NM DHCP dispatcher script Updates the patch with downstream changes from https://github.com/openshift/os/pull/486 and https://github.com/openshift/os/pull/494
2021-02-01 16:32:54 +00:00
Co-Authored-By: Christian Glombek <cglombek@redhat.com>
patch DHCP NM dispatcher for distribution Patch the upstream example `nm-dispatcher.dhcp` with Fedora/RHEL-specific behavior including exiting if a dhclient install is detected, and using the /etc/sysconfig paths. Originally part of work for fixing integration between the NetworkManager internal DHCP client and chrony: https://bugzilla.redhat.com/show_bug.cgi?id=1800901
2020-06-26 00:56:53 +00:00
diff --git a/examples/chrony.nm-dispatcher.dhcp b/examples/chrony.nm-dispatcher.dhcp
update NM DHCP dispatcher script Updates the patch with downstream changes from https://github.com/openshift/os/pull/486 and https://github.com/openshift/os/pull/494
2021-02-01 16:32:54 +00:00
index 6ea4c37..a6ad35a 100644
patch DHCP NM dispatcher for distribution Patch the upstream example `nm-dispatcher.dhcp` with Fedora/RHEL-specific behavior including exiting if a dhclient install is detected, and using the /etc/sysconfig paths. Originally part of work for fixing integration between the NetworkManager internal DHCP client and chrony: https://bugzilla.redhat.com/show_bug.cgi?id=1800901
2020-06-26 00:56:53 +00:00
--- a/examples/chrony.nm-dispatcher.dhcp
+++ b/examples/chrony.nm-dispatcher.dhcp
rework NM-dispatcher/dhclient detection The packaged NM dispatcher and dhclient scripts provide the same functionality. Only one should be active depending on the system configuration. Instead of guessing in the NM dispatcher script whether the dhclient script is executed, check in the dhclient script whether it is called from a NM dispatcher script (the 11-dhclient script included in the dhcp-client package). This is simpler and it removes dependency on the 11-dhclient script.
2021-04-22 10:32:13 +00:00
@@ -6,16 +6,24 @@
patch DHCP NM dispatcher for distribution Patch the upstream example `nm-dispatcher.dhcp` with Fedora/RHEL-specific behavior including exiting if a dhclient install is detected, and using the /etc/sysconfig paths. Originally part of work for fixing integration between the NetworkManager internal DHCP client and chrony: https://bugzilla.redhat.com/show_bug.cgi?id=1800901
2020-06-26 00:56:53 +00:00
update NM DHCP dispatcher script Updates the patch with downstream changes from https://github.com/openshift/os/pull/486 and https://github.com/openshift/os/pull/494
2021-02-01 16:32:54 +00:00
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
patch DHCP NM dispatcher for distribution Patch the upstream example `nm-dispatcher.dhcp` with Fedora/RHEL-specific behavior including exiting if a dhclient install is detected, and using the /etc/sysconfig paths. Originally part of work for fixing integration between the NetworkManager internal DHCP client and chrony: https://bugzilla.redhat.com/show_bug.cgi?id=1800901
2020-06-26 00:56:53 +00:00
# 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 || :
}
--
update NM DHCP dispatcher script Updates the patch with downstream changes from https://github.com/openshift/os/pull/486 and https://github.com/openshift/os/pull/494
2021-02-01 16:32:54 +00:00
2.29.2
patch DHCP NM dispatcher for distribution Patch the upstream example `nm-dispatcher.dhcp` with Fedora/RHEL-specific behavior including exiting if a dhclient install is detected, and using the /etc/sysconfig paths. Originally part of work for fixing integration between the NetworkManager internal DHCP client and chrony: https://bugzilla.redhat.com/show_bug.cgi?id=1800901
2020-06-26 00:56:53 +00:00
Reference in New Issue Copy Permalink