diff options
| author | Dan Williams <dcbw@redhat.com> | 2008-07-27 19:15:20 +0000 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2008-07-27 19:15:20 +0000 |
| commit | 5ddab8fa8954ebc1c06902640a3cbf4be47a750b (patch) | |
| tree | 723b0a9b49377c4faa8ae57602566bb1f5e9d655 | |
| parent | 67aeafaead1e2c0096f67d94d6fc6271409df560 (diff) | |
| download | NetworkManager-5ddab8fa8954ebc1c06902640a3cbf4be47a750b.tar.gz | |
2008-07-27 Dan Williams <dcbw@redhat.com>
Patch from Roy Marples <roy@marples.name>
* src/dhcp-manager/nm-dhcp-dhcpcd.c
- (nm_dhcp_client_start): fixup for latest dhcpcd 4.0 RC
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3856 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | src/dhcp-manager/nm-dhcp-dhcpcd.c | 4 |
2 files changed, 10 insertions, 1 deletions
@@ -1,5 +1,12 @@ 2008-07-27 Dan Williams <dcbw@redhat.com> + Patch from Roy Marples <roy@marples.name> + + * src/dhcp-manager/nm-dhcp-dhcpcd.c + - (nm_dhcp_client_start): fixup for latest dhcpcd 4.0 RC + +2008-07-27 Dan Williams <dcbw@redhat.com> + * src/nm-gsm-device.c - (init_modem_full): send "ATZ E0" after CPIN, because apparently some Huawei devices turn echo back on after CPIN (rh #456770) diff --git a/src/dhcp-manager/nm-dhcp-dhcpcd.c b/src/dhcp-manager/nm-dhcp-dhcpcd.c index 9978c9f2f2..ef4a33abb8 100644 --- a/src/dhcp-manager/nm-dhcp-dhcpcd.c +++ b/src/dhcp-manager/nm-dhcp-dhcpcd.c @@ -90,7 +90,9 @@ nm_dhcp_client_start (NMDHCPDevice *device, NMSettingIP4Config *s_ip4) argv = g_ptr_array_new (); g_ptr_array_add (argv, (gpointer) DHCP_CLIENT_PATH); - g_ptr_array_add (argv, (gpointer) "-X"); /* Don't fork */ + g_ptr_array_add (argv, (gpointer) "-B"); /* Don't background on lease (disable fork()) */ + + g_ptr_array_add (argv, (gpointer) "-K"); /* Disable built-in carrier detection */ g_ptr_array_add (argv, (gpointer) "-L"); /* Disable built-in IPv4LL since we use avahi-autoipd */ |