morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 00:14:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

network: do not remove static routes on other interfaces that are currently in the pending state

Browse Source 
Otherwise, even if .network file has KeepConfiguration=yes, routes on
an interfaces may be removed on restart.

Fixes a bug introduced by 8d01e44c1f.
This commit is contained in:
Yu Watanabe
2025-03-15 09:38:09 +09:00
parent 5209e9cb05
commit cf28def391
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/network/networkd-route.c
View File

@@ -1538,15 +1538,22 @@ int link_drop_routes(Link *link, bool only_static) {
if (!link_should_mark_config(link, only_static, route->source, route->protocol))
continue;
/* When we also mark foreign routes, do not mark routes assigned to other interfaces.
* Otherwise, routes assigned to unmanaged interfaces will be dropped.
* Note, route_get_link() does not provide assigned link for routes with an unreachable type
* or IPv4 multipath routes. So, the current implementation does not support managing such
* routes by other daemon or so, unless ManageForeignRoutes=no. */
if (!only_static) {
Link *route_link;
Link *route_link = NULL;
if (route_get_link(link->manager, route, &route_link) >= 0 && route_link != link) {
/* When we also mark foreign routes, do not mark routes assigned to other interfaces.
* Otherwise, routes assigned to unmanaged interfaces will be dropped.
* Note, route_get_link() does not provide assigned link for routes with an
* unreachable type or IPv4 multipath routes. So, the current implementation does not
* support managing such routes by other daemon or so, unless ManageForeignRoutes=no. */
if (!only_static)
continue;
if (route_get_link(link->manager, route, &route_link) >= 0 && route_link != link)
/* When we mark only static routes, do not mark routes assigned to links that we do
* not know the assignment of .network files to the interfaces. Otherwise, if an
* interface is in the pending state, even if the .network file to be assigned to the
* interface has KeepConfiguration=yes, routes on the interface will be removed.
* This is especially important when systemd-networkd is restarted. */
if (!IN_SET(route_link->state, LINK_STATE_UNMANAGED, LINK_STATE_CONFIGURING, LINK_STATE_CONFIGURED))
continue;
}