Fixup for the networkd route fix

This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2016-08-10 09:55:08 -04:00
parent 96242b19e4
commit 6474b3a260
2 changed files with 32 additions and 1 deletions

View File

@ -0,0 +1,27 @@
From b741fc48693ce1bc72179eababf7acd691230409 Mon Sep 17 00:00:00 2001
From: tomty89 <tom.ty89@gmail.com>
Date: Sat, 4 Jun 2016 18:31:07 +0800
Subject: [PATCH] networkd-link: fix handler typo for route_remove() (#3433)
Obviously we've been using the wrong handler here. Fixes #3352.
(cherry picked from commit 3fb1ac5d57954bb0d881a68777e996b46ed44ce3)
---
src/network/networkd-link.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 4fe3b888d2..9a2de0126e 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -2025,7 +2025,7 @@ static int link_drop_foreign_config(Link *link) {
if (route->protocol == RTPROT_KERNEL)
continue;
- r = route_remove(route, link, link_address_remove_handler);
+ r = route_remove(route, link, link_route_remove_handler);
if (r < 0)
return r;
}
--
2.9.0

View File

@ -12,7 +12,7 @@
Name: systemd
Url: http://www.freedesktop.org/wiki/Software/systemd
Version: 229
Release: 11%{?gitcommit:.git%{gitcommitshort}}%{?dist}
Release: 12%{?gitcommit:.git%{gitcommitshort}}%{?dist}
# For a breakdown of the licensing, see README
License: LGPLv2+ and MIT and GPLv2+
Summary: A System and Service Manager
@ -78,6 +78,7 @@ Patch0042: 0042-udev-bump-TasksMax-to-inifinity-3593.patch
Patch0043: 0043-networkd-disable-IPv6-for-bridge-slave.patch
Patch0044: 0044-networkd-add-route-expiration-handler-3242.patch
Patch0045: 0045-coredump-ignore-RLIMIT_CORE.patch
Patch0046: 0046-networkd-link-fix-handler-typo-for-route_remove-3433.patch
Patch0999: 0999-resolved-create-etc-resolv.conf-symlink-at-runtime.patch
@ -962,6 +963,9 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd
/usr/lib/firewalld/services/*
%changelog
* Wed Aug 10 2016 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 229-12
- Fixup for the networkd route fix (#1365915)
* Tue Aug 9 2016 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 229-11
- Ignore RLIMIT_CORE temporarily for F24 (#1309172, see comment 24)
- Two networkd fixes (#1344661, #1350219)