[PATCH] Work with dhcpcd-4.0.0-rc1

[Roy Marples <roy marples name>]

Hi List!

dhcpcd-4.0.0-rc1 was released today - finally got IPv4LL fully conformant
with Apples bonjour test suite. However, that also means that it is now
carrier aware. As NetworkManager is also carrier aware and has it's own
IPv4LL implementation, I attach a patch to disable this when dhcpcd is
called by NetworkManager.

Also, the -X flag has been moved to the -B flag (to complement -b for
background immediately, a new option for running dhcpcd in startup scripts
and doesn't stall the boot looking for a lease). The -X flag only existed
in the last beta, and is really only for NetworkManager so no-one should
mind this move.

Please apply to svn :)

Thanks

Roy

Index: src/dhcp-manager/nm-dhcp-dhcpcd.c
===================================================================
--- src/dhcp-manager/nm-dhcp-dhcpcd.c	(revision 3842)
+++ src/dhcp-manager/nm-dhcp-dhcpcd.c	(working copy)
@@ -90,8 +90,10 @@
 	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 */
 
 	g_ptr_array_add (argv, (gpointer) "-c");	/* Set script file */