diff options
| author | Tom Gundersen <teg@jklm.no> | 2016-01-20 17:33:59 +0100 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2016-01-20 17:33:59 +0100 |
| commit | 4ddbb474725c5e75b66bba9d5a9b2115fbe488ef (patch) | |
| tree | 15e3fd54587d57daae2d0a921674ddfdb8bae0e3 /src/network/networkd-link.c | |
| parent | afd806fc480dc8d17b6a7837e474b2caa8a5c850 (diff) | |
| parent | 02e286219479ffa70ffeed5203d12e7fd831d9df (diff) | |
Merge pull request #2267 from gdamjan/dont-drop-critical
networkd: link - do not drop config for critical interfaces
Diffstat (limited to 'src/network/networkd-link.c')
| -rw-r--r-- | src/network/networkd-link.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index 10fec5e75f..bbda691c08 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -2039,9 +2039,9 @@ static int link_configure(Link *link) { assert(link->network); assert(link->state == LINK_STATE_PENDING); - /* Drop foreign config, but ignore loopback device. - * We do not want to remove loopback address. */ - if (!(link->flags & IFF_LOOPBACK)) { + /* Drop foreign config, but ignore loopback or critical devices. + * We do not want to remove loopback address or addresses used for root NFS. */ + if (!(link->flags & IFF_LOOPBACK) && !(link->network->dhcp_critical)) { r = link_drop_foreign_config(link); if (r < 0) return r; |