Magellan Linux

Annotation of /trunk/systemd/patches/systemd-228-networkd-link-do-not-drop-config-for-loopback-device.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 2751 - (hide annotations) (download)
Thu Jan 14 13:29:31 2016 UTC (8 years, 3 months ago) by niro
File size: 715 byte(s)
-upstream networkd fixes
1 niro 2751 --- systemd/src/network/networkd-link.c 2016-01-14 14:31:32.518552946 +0100
2     +++ systemd-patched/src/network/networkd-link.c 2016-01-14 14:33:29.874884552 +0100
3     @@ -2040,9 +2040,13 @@
4     assert(link->network);
5     assert(link->state == LINK_STATE_PENDING);
6    
7     - r = link_drop_foreign_config(link);
8     - if (r < 0)
9     - return r;
10     + /* Drop foreign config, but ignore loopback device.
11     + * We do not want to remove loopback address. */
12     + if (!(link->flags & IFF_LOOPBACK)) {
13     + r = link_drop_foreign_config(link);
14     + if (r < 0)
15     + return r;
16     + }
17    
18     r = link_set_bridge_fdb(link);
19     if (r < 0)