From ba630b828bf8331fbd49fd88d5178a8c25823e5d Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Fri, 17 Nov 2017 11:33:06 +0100 Subject: [PATCH] core: don't reset existing routes when merging IP setting Don't reset existing routes if ipvx.ignore-auto-routes=yes: callers should already avoid adding them when not needed. Previously we would also reset the manual gateway route just added. Fixes: 5c299454b49b165f645c25fd3e083c0bb747ad91 https://bugzilla.gnome.org/show_bug.cgi?id=790423 (cherry picked from commit a0cd75b20c4bda0eb38c1c4b356d5da95822f592) --- src/nm-ip4-config.c | 2 -- src/nm-ip6-config.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/src/nm-ip4-config.c b/src/nm-ip4-config.c index 94f4a28e15..499cd9e40e 100644 --- a/src/nm-ip4-config.c +++ b/src/nm-ip4-config.c @@ -954,8 +954,6 @@ nm_ip4_config_merge_setting (NMIP4Config *self, } /* Routes */ - if (nm_setting_ip_config_get_ignore_auto_routes (setting)) - nm_ip4_config_reset_routes (self); for (i = 0; i < nroutes; i++) { NMIPRoute *s_route = nm_setting_ip_config_get_route (setting, i); NMPlatformIP4Route route; diff --git a/src/nm-ip6-config.c b/src/nm-ip6-config.c index 28841e3434..2cb34968ac 100644 --- a/src/nm-ip6-config.c +++ b/src/nm-ip6-config.c @@ -629,8 +629,6 @@ nm_ip6_config_merge_setting (NMIP6Config *self, } /* Routes */ - if (nm_setting_ip_config_get_ignore_auto_routes (setting)) - nm_ip6_config_reset_routes (self); for (i = 0; i < nroutes; i++) { NMIPRoute *s_route = nm_setting_ip_config_get_route (setting, i); NMPlatformIP6Route route;