networkd: link - don't fail if master netdev already exists

This allows restarts to work gracefully.

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index ce9fbb5ed8d5241c75678970c65c7a5b67b42c2a..a523a3e9b2d7f47f16785e9ef8b3a46d7d671fd0 100644 (file)
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -1723,6 +1723,8 @@ static int link_enslaved(Link *link) {
         assert(link->state == LINK_STATE_ENSLAVING);
         assert(link->network);
 
         assert(link->state == LINK_STATE_ENSLAVING);
         assert(link->network);
 

+        log_debug_link(link, "enslaved");
+

         if (!(link->flags & IFF_UP)) {
                 r = link_up(link);
                 if (r < 0) {
         if (!(link->flags & IFF_UP)) {
                 r = link_up(link);
                 if (r < 0) {


@@ -1749,7 +1751,7 @@ static int enslave_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
                 return 1;
 
         r = sd_rtnl_message_get_errno(m);
                 return 1;
 
         r = sd_rtnl_message_get_errno(m);

-        if (r < 0) {
+        if (r < 0 && r != -EEXIST) {

                 log_struct_link(LOG_ERR, link,
                                 "MESSAGE=%-*s: could not enslave: %s",
                                 IFNAMSIZ,
                 log_struct_link(LOG_ERR, link,
                                 "MESSAGE=%-*s: could not enslave: %s",
                                 IFNAMSIZ,


@@ -1760,9 +1762,7 @@ static int enslave_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
                 return 1;
         }
 
                 return 1;
         }
 

-        log_debug_link(link, "enslaved");
-
-        if (link->enslaving == 0)
+        if (link->enslaving <= 0)

                 link_enslaved(link);
 
         return 1;
                 link_enslaved(link);
 
         return 1;