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
This commit is contained in:
Michael Biebl 2018-09-04 15:58:30 +02:00 committed by Thomas Haller
parent c25d54d0fd
commit e4c7a60854

View file

@ -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");