shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-10-27 18:55:09 +03:00
Code

Merge pull request #2267 from gdamjan/dont-drop-critical

Browse Source 
networkd: link - do not drop config for critical interfaces
This commit is contained in:
Tom Gundersen 2016-01-20 17:33:59 +01:00
commit 4ddbb47472
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/network/networkd-link.c
View File

@ -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;