diff options
| author | Michael Biebl <biebl@debian.org> | 2018-09-04 15:58:30 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-09-05 09:14:52 +0200 |
| commit | e4c7a6085482c182cca0c4a5eaae48c0b9fe72c3 (patch) | |
| tree | efc0880d32cb427fc80108a8f08803d409d3fcca | |
| parent | c25d54d0fd24a1d0c7d8f32c51b6ebc88c94faba (diff) | |
| download | NetworkManager-e4c7a6085482c182cca0c4a5eaae48c0b9fe72c3.tar.gz | |
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
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/11
| -rw-r--r-- | src/settings/plugins/ifupdown/nms-ifupdown-plugin.c | 3 |
1 files changed, 3 insertions, 0 deletions
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"); |