mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2025-12-30 16:40:13 +01:00
core/platform: revise failure to activate connection on error of setting route
This revises the commit fbde824584 which
causes the activation of a connection to fail generally when a route
cannot be added. Instead, we only want to fail for user configured
routes.
Related: https://bugzilla.gnome.org/show_bug.cgi?id=722843
Related: https://bugzilla.redhat.com/show_bug.cgi?id=999544
Related: https://bugzilla.redhat.com/show_bug.cgi?id=1005416
Related: https://bugzilla.gnome.org/show_bug.cgi?id=721771
Signed-off-by: Thomas Haller <thaller@redhat.com>
This commit is contained in:
parent
29501c9955
commit
c8d7a06d64
1 changed files with 10 additions and 0 deletions
|
|
@ -1635,6 +1635,11 @@ nm_platform_ip4_route_sync (int ifindex, const GArray *known_routes)
|
|||
known_route->gateway,
|
||||
known_route->metric,
|
||||
known_route->mss);
|
||||
if (!success && known_route->source < NM_PLATFORM_SOURCE_USER) {
|
||||
nm_log_dbg (LOGD_PLATFORM, "ignore error adding IPv4 route to kernel: %s",
|
||||
nm_platform_ip4_route_to_string (known_route));
|
||||
success = TRUE;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1689,6 +1694,11 @@ nm_platform_ip6_route_sync (int ifindex, const GArray *known_routes)
|
|||
known_route->gateway,
|
||||
known_route->metric,
|
||||
known_route->mss);
|
||||
if (!success && known_route->source < NM_PLATFORM_SOURCE_USER) {
|
||||
nm_log_dbg (LOGD_PLATFORM, "ignore error adding IPv6 route to kernel: %s",
|
||||
nm_platform_ip6_route_to_string (known_route));
|
||||
success = TRUE;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue