Merge pull request coreos#494 from LorbusChris/dhclient

chrony NM dispatcher: Account for dhclient dispatcher script in /usr/lib/
c4rt0 · Feb 1, 2021 · 3b8f9ff · 3b8f9ff
2 parents 5aa8db5 + 664da8f
commit 3b8f9ff
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/manifest.yaml b/manifest.yaml
@@ -299,4 +299,5 @@ remove-from-packages:
   - - dhcp-client
     - "/etc/dhcp/dhclient.conf"
     - "/etc/NetworkManager/dispatcher.d/11-dhclient"
+    - "/usr/lib/NetworkManager/dispatcher.d/11-dhclient"
     - "/usr/lib64/pm-utils/sleep.d/56dhclient"
diff --git a/overlay.d/21dhcp-chrony/etc/NetworkManager/dispatcher.d/20-coreos-chrony-dhcp b/overlay.d/21dhcp-chrony/etc/NetworkManager/dispatcher.d/20-coreos-chrony-dhcp
@@ -25,7 +25,7 @@ export LC_ALL=C
 # In RHCOS, 11-dhclient is excluded and not shipped with base image.
 [ -e /usr/sbin/dhclient ] && \
     [ -e /etc/dhcp/dhclient.d/chrony.sh ] && \
-    [ -e /etc/NetworkManager/dispatcher.d/11-dhclient ] && \
+    [ -e /etc/NetworkManager/dispatcher.d/11-dhclient -o -e /usr/lib/NetworkManager/dispatcher.d/11-dhclient ] && \
     exit 0
 
 interface=$1