From: Hristo Venev <hristo@venev.name>
Date: Tue, 5 Dec 2017 14:49:00 +0000 (+0200)
Subject: networkd: fix promote_secondaries logic
X-Git-Tag: v236~59^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e1a72535cf74e5e66017c33f9b0a701f34ae179;p=thirdparty%2Fsystemd.git

networkd: fix promote_secondaries logic

The value for `default` has no influence at all.
---

diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c
index cacd867f9b0..5ce03e5d40c 100644
--- a/src/network/networkd-dhcp4.c
+++ b/src/network/networkd-dhcp4.c
@@ -627,7 +627,7 @@ int dhcp4_set_promote_secondaries(Link *link) {
          * interface. If it is not globally enabled or enabled for the
          * specific interface we must either enable it.
          */
-        if (!(promote_secondaries_enabled("all") || promote_secondaries_enabled("default") || promote_secondaries_enabled(link->ifname))) {
+        if (!(promote_secondaries_enabled("all") || promote_secondaries_enabled(link->ifname))) {
                 char *promote_secondaries_path = NULL;
 
                 log_link_debug(link, "promote_secondaries is unset, setting it");