File tree Expand file tree Collapse file tree 2 files changed +0
-18
lines changed
overlay.d/21dhcp-chrony/etc/NetworkManager/dispatcher.d Expand file tree Collapse file tree 2 files changed +0
-18
lines changed Original file line number Diff line number Diff line change @@ -285,15 +285,6 @@ remove-from-packages:
285285 # https://bugzilla.redhat.com/show_bug.cgi?id=1727058
286286 - - initscripts
287287 - " /"
288- # In newer dracut-network dhclient isn't required if you have NM 1.20
289- # https://github.com/dracutdevs/dracut/commit/e863807
290- # Let's keep only the binaries so users still relying on them can continue
291- # to use them in the real root as long as they provide the configuration themselves.
292- - - dhcp-client
293- - " /etc/dhcp/dhclient.conf"
294- - " /etc/NetworkManager/dispatcher.d/11-dhclient"
295- - " /usr/lib/NetworkManager/dispatcher.d/11-dhclient"
296- - " /usr/lib64/pm-utils/sleep.d/56dhclient"
297288 # Remove the systemd unit; we only want the binary to be used
298289 # by MCD or kubelet. See above.
299290 - - conntrack-tools
Original file line number Diff line number Diff line change @@ -19,15 +19,6 @@ export LC_ALL=C
1919 grep -q " dhcp4-change" /etc/NetworkManager/dispatcher.d/20-chrony-dhcp && \
2020 exit 0
2121
22- # If a dhclient installation is present, avoid a redundant operation
23- # if dhclient handles NTP server config through its own chrony config script,
24- # exec'ed by NetworkManager's 11-dhclient dispatcher script.
25- # In RHCOS, 11-dhclient is excluded and not shipped with base image.
26- [ -e /usr/sbin/dhclient ] && \
27- [ -e /etc/dhcp/dhclient.d/chrony.sh ] && \
28- [ -e /etc/NetworkManager/dispatcher.d/11-dhclient -o -e /usr/lib/NetworkManager/dispatcher.d/11-dhclient ] && \
29- exit 0
30-
3122interface=$1
3223action=$2
3324
You can’t perform that action at this time.
0 commit comments