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
This commit is contained in:
Dan Williams 2008-07-27 19:15:20 +00:00
parent 67aeafaead
commit 5ddab8fa89
2 changed files with 10 additions and 1 deletions

View file

@ -1,3 +1,10 @@
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

View file

@ -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 */