diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2008-12-17 18:04:11 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2008-12-17 18:04:11 -0800 |
| commit | 4c5a5fb53bccceff331bae70f748bf9b4609fe0a (patch) | |
| tree | d6ae69d0d3f4a4d760a3254ec326bca4a8afacfe /dhcpcd-hooks/90-NetworkManager | |
| parent | e95877ecfa1170d77b1ec1f66752725cdda01b64 (diff) | |
| download | external_dhcpcd-4c5a5fb53bccceff331bae70f748bf9b4609fe0a.zip external_dhcpcd-4c5a5fb53bccceff331bae70f748bf9b4609fe0a.tar.gz external_dhcpcd-4c5a5fb53bccceff331bae70f748bf9b4609fe0a.tar.bz2 | |
Code drop from //branches/cupcake/...@124589
Diffstat (limited to 'dhcpcd-hooks/90-NetworkManager')
| -rw-r--r-- | dhcpcd-hooks/90-NetworkManager | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/dhcpcd-hooks/90-NetworkManager b/dhcpcd-hooks/90-NetworkManager index f05ccd7..c4d69fe 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 |