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

diff --git a/dhcpcd-hooks/90-NetworkManager b/dhcpcd-hooks/90-NetworkManager
index f05ccd738aa9490d63afcd8bc7eb724889ab5e4f..c4d69fec8a52156a16a5cca8edc6715b998bd33f 100644 (file)
--- 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