From d60a988518cb0851488bc21732271a971877cdcd Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 18 Nov 2010 16:30:00 -0600 Subject: [PATCH 1/4] dhcpcd: prevent dhcpcd from messing with routing (bgo #634983) Since NM is already handling that. --- src/dhcp-manager/nm-dhcp-dhcpcd.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) 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 ); -- 1.7.3.4