From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
Date: Fri, 25 May 2018 14:34:38 +0000 (-0400)
Subject: Always rename an interface to its name specified in config if no NamePolicy= is specified
X-Git-Tag: v240~345
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=55b6530baacf;p=thirdparty%2Fsystemd.git

Always rename an interface to its name specified in config if no NamePolicy= is specified

This is for issue #9006
---

diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c
index c39d8791f2a..b9c95e6139b 100644
--- a/src/udev/net/link-config.c
+++ b/src/udev/net/link-config.c
@@ -312,16 +312,11 @@ static bool should_rename(sd_device *device, bool respect_predictable) {
                 return true;
 
         switch (type) {
-        case NET_NAME_USER:
-        case NET_NAME_RENAMED:
-                /* these were already named by userspace, do not touch again */
-                return false;
         case NET_NAME_PREDICTABLE:
                 /* the kernel claims to have given a predictable name */
                 if (respect_predictable)
                         return false;
                 _fallthrough_;
-        case NET_NAME_ENUM:
         default:
                 /* the name is known to be bad, or of an unknown type */
                 return true;
@@ -443,12 +438,8 @@ int link_config_apply(link_config_ctx *ctx, link_config *config,
                 }
         }
 
-        if (should_rename(device, respect_predictable)) {
-                /* if not set by policy, fall back manually set name */
-                if (!new_name)
-                        new_name = config->name;
-        } else
-                new_name = NULL;
+        if (!new_name && should_rename(device, respect_predictable))
+                new_name = config->name;
 
         switch (config->mac_policy) {
                 case MACPOLICY_PERSISTENT: