mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2025-12-24 23:00:07 +01:00
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.
This commit is contained in:
parent
da2ae8ce4e
commit
1c46ddf196
1 changed files with 2 additions and 2 deletions
|
|
@ -1129,8 +1129,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
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue