2005-02-22 Dan Williams <dcbw@redhat.com>
* src/NetworkManagerPolicy.c - (nm_policy_activation_finish): Deactivate a device if its activation fails, and NULL out data->active_device so that we have to choose another one. This may make NetworkManager keep attempting to connect to a wired network if it fails, but if it keeps failing the wired network has more problems than just NetworkManager. * src/backends/NetworkManagerRedHat.c - (nm_system_update_dns): fix to actually run nscd -i hosts when nscd is already running * named/nm-named-manager.c - (rewrite_resolv_conf): Call nm_system_update_dns() when not using named so that the distro can flush whatever name service caching daemon it uses git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@468 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
@@ -282,6 +282,9 @@ gboolean nm_policy_activation_finish (gpointer user_data)
|
||||
}
|
||||
else
|
||||
syslog (LOG_INFO, "Activation (%s) failed.", nm_device_get_iface (dev));
|
||||
if (data->active_device == dev)
|
||||
data->active_device = NULL;
|
||||
nm_device_deactivate (dev, FALSE);
|
||||
break;
|
||||
|
||||
case DEVICE_ACTIVATION_CANCELED:
|
||||
|
Reference in New Issue
Block a user