colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: leave disabled devices up on shutdown

Browse Source 
Bridge/bond slaves don't really need to be taken down when we quit.
This commit is contained in:
Dan Williams
2012-10-30 18:05:52 -05:00
parent cfff5a63d9
commit c091415bff
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/nm-device.c
View File

@@ -3812,7 +3812,6 @@ dispose (GObject *object)
connection = nm_device_get_connection (self); connection = nm_device_get_connection (self);
if (connection) { if (connection) {
/* Only static or DHCP IPv4 connections can be left up. /* Only static or DHCP IPv4 connections can be left up.
* All IPv6 connections can be left up, so we don't have * All IPv6 connections can be left up, so we don't have
* to check that. * to check that.
@@ -3822,7 +3821,8 @@ dispose (GObject *object)
method = nm_setting_ip4_config_get_method (s_ip4); method = nm_setting_ip4_config_get_method (s_ip4);
if ( !method if ( !method
|| !strcmp (method, NM_SETTING_IP4_CONFIG_METHOD_AUTO) || !strcmp (method, NM_SETTING_IP4_CONFIG_METHOD_AUTO)
|| !strcmp (method, NM_SETTING_IP4_CONFIG_METHOD_MANUAL)) || !strcmp (method, NM_SETTING_IP4_CONFIG_METHOD_MANUAL)
|| !strcmp (method, NM_SETTING_IP4_CONFIG_METHOD_DISABLED))
take_down = FALSE; take_down = FALSE;
} }
} }