From 907d99c2ac371b3893863a43a9c30f88f61763ed Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 14 Jun 2013 12:33:38 -0400 Subject: [PATCH] Make no-auto-default=* work again Sadly '*' is a valid interface name, and so the config processing was thinking it was shorthand for "interface-name:*". --- src/config/nm-config-device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/config/nm-config-device.c b/src/config/nm-config-device.c index bdd5b0bead..6914f033a2 100644 --- a/src/config/nm-config-device.c +++ b/src/config/nm-config-device.c @@ -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)) {