fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-29 17:20:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make no-auto-default=* work again

Browse source 
Sadly '*' is a valid interface name, and so the config processing was
thinking it was shorthand for "interface-name:*".
This commit is contained in:
Colin Walters 2013-06-14 12:33:38 -04:00 • committed by Dan Winship
parent ac1692a17b
commit 907d99c2ac
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/config/nm-config-device.c
View file

@ -50,7 +50,9 @@ nm_config_device_spec_match_list (NMConfigDevice *self, const char **config_spec
* we allow untagged interface names as well.
*/
for (i = 0; config_specs[i]; i++) {
if (nm_utils_iface_valid_name (config_specs[i]))
if (g_strcmp0 (config_specs[i], "*") == 0)
specs = g_slist_prepend (specs, g_strdup (config_specs[i]));
else if (nm_utils_iface_valid_name (config_specs[i]))
specs = g_slist_prepend (specs, g_strdup_printf ("interface-name:%s", config_specs[i]));
else if ( nm_utils_hwaddr_aton (config_specs[i], ARPHRD_ETHER, buf)
|| nm_utils_hwaddr_aton (config_specs[i], ARPHRD_INFINIBAND, buf)) {