From: Tom Yan <tom.ty89@gmail.com>
Date: Sat, 28 May 2016 05:31:41 +0000 (+0800)
Subject: networkd: unset master if not enslaved with networkd
X-Git-Tag: v231~245^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b2d8603ce5b9cbe797745ab6339f6f5e0dfb4ad;p=thirdparty%2Fsystemd.git

networkd: unset master if not enslaved with networkd

When we manage an interface with networkd but not as a slave (i.e. no `Bridge=` or `Bond=` set in its .network), we do not want it to remain slaved.
---

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 6e6f9618b0d..377e6f52f45 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -1568,6 +1568,13 @@ static int link_up(Link *link) {
         if (r < 0)
                 return log_link_error_errno(link, r, "Could not allocate RTM_SETLINK message: %m");
 
+        /* set it free if not enslaved with networkd */
+        if (!link->network->bridge && !link->network->bond) {
+                r = sd_netlink_message_append_u32(req, IFLA_MASTER, 0);
+                if (r < 0)
+                        return log_link_error_errno(link, r, "Could not append IFLA_MASTER attribute: %m");
+        }
+
         r = sd_rtnl_message_link_set_flags(req, IFF_UP, IFF_UP);
         if (r < 0)
                 return log_link_error_errno(link, r, "Could not set link flags: %m");