From c1dea88b98e664209d22a0eda3287a994747d47b Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 2 Feb 2005 19:30:10 +0000 Subject: [PATCH] 2005-02-02 Dan Williams * src/NetworkManagerDHCP.c - Hopefully fix double-default-route problem by cleaning up the default route added by DHCP code right before the DHCP transaction begins git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@405 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 6 ++++++ src/NetworkManagerDHCP.c | 3 +++ 2 files changed, 9 insertions(+) diff --git a/ChangeLog b/ChangeLog index 97b9bc2fc1..e5da574238 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-02-02 Dan Williams + + * src/NetworkManagerDHCP.c + - Hopefully fix double-default-route problem by cleaning up the default + route added by DHCP code right before the DHCP transaction begins + 2005-02-02 Dan Williams * named/nm-named-manager.c diff --git a/src/NetworkManagerDHCP.c b/src/NetworkManagerDHCP.c index e9ee81c541..ac3c3957ee 100644 --- a/src/NetworkManagerDHCP.c +++ b/src/NetworkManagerDHCP.c @@ -121,6 +121,9 @@ static void nm_device_dhcp_configure (NMDevice *dev) g_return_if_fail (dev != NULL); g_return_if_fail (dev->dhcp_iface != NULL); + /* DHCP sets up a default route for the device, we need to remove that. */ + nm_system_device_flush_routes (dev); + /* Replace basic info */ nm_system_device_set_ip4_address (dev, dev->dhcp_iface->ciaddr);