From: Tom Gundersen <teg@jklm.no>
Date: Tue, 12 Aug 2014 11:15:11 +0000 (+0200)
Subject: udev: link-config - fix naming policy
X-Git-Tag: v216~163
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=68ba38770640413b4fa06773447666eb88a38d4c

udev: link-config - fix naming policy

Don't exit the name-finding loop when the 'kernel' policy is detected. We should
still find a fallback name if possible in the (very likely) case that no kernel
name is set at all.
---

diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c
index 5b94e4882..4ff20e6d1 100644
--- a/src/udev/net/link-config.c
+++ b/src/udev/net/link-config.c
@@ -382,8 +382,8 @@ int link_config_apply(link_config_ctx *ctx, link_config *config,
         if (ctx->enable_name_policy && config->name_policy) {
                 NamePolicy *policy;
 
-                for (policy = config->name_policy; !respect_predictable && !new_name &&
-                                                   *policy != _NAMEPOLICY_INVALID; policy++) {
+                for (policy = config->name_policy;
+                     !new_name && *policy != _NAMEPOLICY_INVALID; policy++) {
                         switch (*policy) {
                                 case NAMEPOLICY_KERNEL:
                                         respect_predictable = true;