From 8c0c0a36ee2c44f31cf0eefdbe1a7230a3208c3c Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 4 Sep 2018 15:58:30 +0200 Subject: ifupdown: properly handle special "none" keyword for bridge_ports If this option is set, we should not add a device named "none" but simply don't add any devices at all. https://manpages.debian.org/testing/bridge-utils/bridge-utils-interfaces.5.en.html --- src/settings/plugins/ifupdown/nms-ifupdown-plugin.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c b/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c index a6b22de24d..0cad156457 100644 --- a/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c +++ b/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c @@ -370,6 +370,9 @@ init (NMSettingsPlugin *config) state--; continue; } + if (!strcmp ("none", token)) { + continue; + } if (state == 0 && strlen (token) > 0) { nm_log_info (LOGD_SETTINGS, "adding bridge port %s to eni_ifaces", token); g_hash_table_insert (priv->eni_ifaces, g_strdup (token), "known"); -- cgit v1.2.1