Date: Monday, November 22, 2010 @ 09:23:10 Author: ibiru Revision: 100288
add missing patch Added: networkmanager/trunk/dhcpcd.patch --------------+ dhcpcd.patch | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) Added: dhcpcd.patch =================================================================== --- dhcpcd.patch (rev 0) +++ dhcpcd.patch 2010-11-22 14:23:10 UTC (rev 100288) @@ -0,0 +1,21 @@ +commit 3992c7db507d586ffeffa214edc4b9a399b8b396 +Author: Dan Williams <[email protected]> +Date: Thu Nov 18 16:30:00 2010 -0600 + + dhcpcd: prevent dhcpcd from messing with routing (bgo #634983) + + Since NM is already handling that. + +diff --git a/src/dhcp-manager/nm-dhcp-dhcpcd.c b/src/dhcp-manager/nm-dhcp-dhcpcd.c +index 378a97b..4fb703c 100644 +--- a/src/dhcp-manager/nm-dhcp-dhcpcd.c ++++ b/src/dhcp-manager/nm-dhcp-dhcpcd.c +@@ -128,6 +128,8 @@ real_ip4_start (NMDHCPClient *client, + + g_ptr_array_add (argv, (gpointer) "-L"); /* Disable built-in IPv4LL since we use avahi-autoipd */ + ++ g_ptr_array_add (argv, (gpointer) "-G"); /* Let NM handle routing */ ++ + g_ptr_array_add (argv, (gpointer) "-c"); /* Set script file */ + g_ptr_array_add (argv, (gpointer) ACTION_SCRIPT_PATH ); +
