From e10a8f1f375c9ff669a14674e14f9789b2f321b6 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Wed, 2 Sep 2015 19:39:00 +0200 Subject: [PATCH 4/4] device: don't reset NM_UNMANAGED_DEFAULT when platform doesn't override this This would cause the ip_vti0 generic device (that appears upon insertion of ip_vti module during libreswan ipsec stack init) to go managed and brought UP. Without addresses assigned the device would cause all the VPN traffic to disappear in the oblivion. (cherry picked from commit 1c46ddf196b1e87782049e8f9ee3ada93e0dc85b) --- src/devices/nm-device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 5889582..b4e9252 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -1158,8 +1158,8 @@ nm_device_finish_init (NMDevice *self) * Currently it can happen that NM deletes 127.0.0.1 address. */ nm_device_set_initial_unmanaged_flag (self, NM_UNMANAGED_DEFAULT, TRUE); } else if (priv->platform_link_initialized || (priv->is_nm_owned && nm_device_is_software (self))) { - nm_platform_link_get_unmanaged (NM_PLATFORM_GET, priv->ifindex, &platform_unmanaged); - nm_device_set_initial_unmanaged_flag (self, NM_UNMANAGED_DEFAULT, platform_unmanaged); + if (nm_platform_link_get_unmanaged (NM_PLATFORM_GET, priv->ifindex, &platform_unmanaged)) + nm_device_set_initial_unmanaged_flag (self, NM_UNMANAGED_DEFAULT, platform_unmanaged); } else { /* Hardware and externally-created software links stay unmanaged * until they are fully initialized by the platform. NM created -- 2.4.3