diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2019-09-03 16:53:15 +0200 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2019-09-03 16:53:15 +0200 |
| commit | dbfbbed53c989aa7b7ac88ad8292e205c6ae0271 (patch) | |
| tree | 01fe9f6cd9863d78bc7ae7dcefc7eaa3a8346193 | |
| parent | 6a7c2d44aee466d11f2a5b94cc6a229be6ff5c88 (diff) | |
| parent | f07aa329b20544c8ae2885c6a468e5670b687397 (diff) | |
| download | NetworkManager-dbfbbed53c989aa7b7ac88ad8292e205c6ae0271.tar.gz | |
core: merge branch 'bg/device-realize-failed-rh1686634'
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/252
https://bugzilla.redhat.com/show_bug.cgi?id=1686634
| -rw-r--r-- | src/devices/nm-device.c | 7 | ||||
| -rw-r--r-- | src/nm-manager.c | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 5310290743..21450b4aa0 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -4165,11 +4165,12 @@ nm_device_create_and_realize (NMDevice *self, nm_auto_nmpobj const NMPObject *plink_keep_alive = NULL; NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self); const NMPlatformLink *plink; + gboolean nm_owned; /* Must be set before device is realized */ plink = nm_platform_link_get_by_ifname (nm_device_get_platform (self), priv->iface); - priv->nm_owned = !plink || !link_type_compatible (self, plink->type, NULL, NULL); - _LOGD (LOGD_DEVICE, "create (is %snm-owned)", priv->nm_owned ? "" : "not "); + nm_owned = !plink || !link_type_compatible (self, plink->type, NULL, NULL); + _LOGD (LOGD_DEVICE, "create (is %snm-owned)", nm_owned ? "" : "not "); plink = NULL; /* Create any resources the device needs */ @@ -4182,6 +4183,8 @@ nm_device_create_and_realize (NMDevice *self, } } + priv->nm_owned = nm_owned; + realize_start_setup (self, plink, FALSE, /* assume_state_guess_assume */ diff --git a/src/nm-manager.c b/src/nm-manager.c index 311bb68dd9..f6ef66bb21 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -2032,7 +2032,6 @@ system_create_virtual_device (NMManager *self, NMConnection *connection) "couldn't create the device: %s", error->message); g_error_free (error); - remove_device (self, device, FALSE); return NULL; } |