Magellan Linux

Annotation of /trunk/systemd/patches/systemd-242-network-drop-invalid-assertion.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 3368 - (hide annotations) (download)
Tue Jul 9 11:20:22 2019 UTC (4 years, 11 months ago) by niro
File size: 862 byte(s)
-added systemd-242 upstream patches
1 niro 3368 From 51aba17b88617515e037e8985d3a4ea871ac47fe Mon Sep 17 00:00:00 2001
2     From: Yu Watanabe <watanabe.yu+github@gmail.com>
3     Date: Sun, 28 Apr 2019 09:06:13 +0200
4     Subject: [PATCH] network: drop invalid assertion
5    
6     The link may not have corresponding .network file.
7     Note that in that case, link_ipv4ll_enabled() and link_dhcp4_enabled()
8     returns false. So, it is safe to drop the assertion.
9    
10     Fixes #12422.
11     ---
12     src/network/networkd-link.c | 1 -
13     1 file changed, 1 deletion(-)
14    
15     diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
16     index ec2190fd13c..8d2711f1851 100644
17     --- a/src/network/networkd-link.c
18     +++ b/src/network/networkd-link.c
19     @@ -1854,7 +1854,6 @@ static int link_acquire_ipv4_conf(Link *link) {
20     int r;
21    
22     assert(link);
23     - assert(link->network);
24     assert(link->manager);
25     assert(link->manager->event);
26