NetworkManager r3856 - in trunk: . src/dhcp-manager

[dcbw svn gnome org]

Author: dcbw
Date: Sun Jul 27 19:15:20 2008
New Revision: 3856
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3856&view=rev

Log:
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



Modified:
   trunk/ChangeLog
   trunk/src/dhcp-manager/nm-dhcp-dhcpcd.c

Modified: trunk/src/dhcp-manager/nm-dhcp-dhcpcd.c
==============================================================================
--- trunk/src/dhcp-manager/nm-dhcp-dhcpcd.c	(original)
+++ trunk/src/dhcp-manager/nm-dhcp-dhcpcd.c	Sun Jul 27 19:15:20 2008
@@ -90,7 +90,9 @@
 	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 */