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

device: don't set nm-owned flag if realize() fails

Browse Source 
The nm-owned flag indicates whether the device was created by NM. If
the realization step fails, the device was not created and so nm-owned
should not be updated.
This commit is contained in:
Beniamino Galvani
2019-08-29 16:45:12 +02:00
parent 6a7c2d44ae
commit 4bc4156424
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/devices/nm-device.c
View File

@@ -4165,11 +4165,12 @@ nm_device_create_and_realize (NMDevice *self,
nm_auto_nmpobj const NMPObject *plink_keep_alive = NULL; nm_auto_nmpobj const NMPObject *plink_keep_alive = NULL;
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self); NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
const NMPlatformLink *plink; const NMPlatformLink *plink;
gboolean nm_owned;
/* Must be set before device is realized */ /* Must be set before device is realized */
plink = nm_platform_link_get_by_ifname (nm_device_get_platform (self), priv->iface); 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); nm_owned = !plink || !link_type_compatible (self, plink->type, NULL, NULL);
_LOGD (LOGD_DEVICE, "create (is %snm-owned)", priv->nm_owned ? "" : "not "); _LOGD (LOGD_DEVICE, "create (is %snm-owned)", nm_owned ? "" : "not ");
plink = NULL; plink = NULL;
/* Create any resources the device needs */ /* 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, realize_start_setup (self,
plink, plink,
FALSE, /* assume_state_guess_assume */ FALSE, /* assume_state_guess_assume */