From: Roy Marples <roy@marples.name>
Date: Thu, 31 Jul 2008 13:39:40 +0000 (+0000)
Subject: It looks impossible to send our information to NM using DBus, so just call the NM... 
X-Git-Tag: v4.0.2~102
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89af1d45058a9e08f9074cbbfcd6904ad555c74b;p=thirdparty%2Fdhcpcd.git

It looks impossible to send our information to NM using DBus, so just call the NM dispatcher directly.
---

diff --git a/dhcpcd-hooks/90-NetworkManager b/dhcpcd-hooks/90-NetworkManager
index f05ccd73..c4d69fec 100644
--- a/dhcpcd-hooks/90-NetworkManager
+++ b/dhcpcd-hooks/90-NetworkManager
@@ -1,7 +1,8 @@
-# Hook for NetworkManager, relies on D-Bus
+# Hook for NetworkManager-0.7.0
+# NOTE: NetworkManager will override the script dhcpcd calls, so this hook
+# only makes sense if NetworkManager is patched NOT to override the
+# script dhcpcd would call.
 
-if type dbus-send >/dev/null 2>&1; then
-	dbus-send --system --dest=com.redhat.dhcp \
-		--type=method_call /com/redhat/dhcp/"${interface}" \
-		com.redhat.dhcp.set 'string:'"`env`"
+if [ -x /usr/libexec/nm-dhcp-client.action ]; then
+	/usr/libexec/nm-dhcp-client.action
 fi