From c091415bffd5d0980ea55d8bc63f937c9e1f483c Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 30 Oct 2012 18:05:52 -0500 Subject: [PATCH] core: leave disabled devices up on shutdown Bridge/bond slaves don't really need to be taken down when we quit. --- src/nm-device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nm-device.c b/src/nm-device.c index 68bb87ee0..221ff46f6 100644 --- a/src/nm-device.c +++ b/src/nm-device.c @@ -3812,7 +3812,6 @@ dispose (GObject *object) connection = nm_device_get_connection (self); if (connection) { - /* Only static or DHCP IPv4 connections can be left up. * All IPv6 connections can be left up, so we don't have * to check that. @@ -3822,7 +3821,8 @@ dispose (GObject *object) method = nm_setting_ip4_config_get_method (s_ip4); if ( !method || !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; } }