diff options
| author | Dan Williams <dcbw@redhat.com> | 2009-09-03 20:36:05 -0500 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2009-09-03 20:43:26 -0500 |
| commit | cecf8f64c77ceb6c6e783f74a05384cacf5de31f (patch) | |
| tree | e07804a29cd02752391e5cc83f78aa8aca1174e9 | |
| parent | 74f125b44e36d5c058c60b6d264e26ceb9c7de5e (diff) | |
ifupdown: fix regression locking connections to their interfaces (lp #424092)
Reported and tirelessly tested by Noel Bergman <noel@devtech.com>
| -rw-r--r-- | system-settings/plugins/ifupdown/plugin.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/system-settings/plugins/ifupdown/plugin.c b/system-settings/plugins/ifupdown/plugin.c index e8e4e25e99..fcda2da993 100644 --- a/system-settings/plugins/ifupdown/plugin.c +++ b/system-settings/plugins/ifupdown/plugin.c @@ -214,7 +214,7 @@ bind_device_to_connection (SCPluginIfupdown *self, s_wired = nm_connection_get_setting (NM_CONNECTION (exported), NM_TYPE_SETTING_WIRED); s_wifi = nm_connection_get_setting (NM_CONNECTION (exported), NM_TYPE_SETTING_WIRELESS); - if (s_wifi) { + if (s_wired) { PLUGIN_PRINT ("SCPluginIfupdown", "locking wired connection setting"); g_object_set (s_wired, NM_SETTING_WIRED_MAC_ADDRESS, mac_address, NULL); } else if (s_wifi) { @@ -252,10 +252,10 @@ udev_device_added (SCPluginIfupdown *self, GUdevDevice *device) g_hash_table_insert (priv->well_known_ifaces, g_strdup (iface), g_object_ref (device)); + bind_device_to_connection (self, device, exported); + if (ALWAYS_UNMANAGE || priv->unmanage_well_known) g_signal_emit_by_name (G_OBJECT (self), NM_SYSTEM_CONFIG_INTERFACE_UNMANAGED_SPECS_CHANGED); - else - bind_device_to_connection (self, device, exported); } static void |