fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-14 21:18:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: fix setting initial EXTERNAL_DOWN unmanaged flag (bgo #725647) (rh #1030947) (bgo #740702)

Browse source 
Broken by 5fb20d8038.
This commit is contained in:
Dan Williams 2014-12-17 11:30:50 -06:00
parent 894ca75f3a
commit 5f47182534
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/devices/nm-device.c
View file

@ -174,6 +174,7 @@ typedef struct {
typedef struct {
gboolean in_state_changed;
gboolean initialized;
NMDeviceState state;
NMDeviceStateReason state_reason;
@ -996,6 +997,8 @@ nm_device_finish_init (NMDevice *self)
{
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
g_assert (priv->initialized == FALSE);
/* Do not manage externally created software devices until they are IFF_UP */
if ( is_software_external (self)
&& !nm_platform_link_is_up (priv->ifindex)
@ -1004,6 +1007,8 @@ nm_device_finish_init (NMDevice *self)
if (priv->master)
nm_device_enslave_slave (priv->master, self, NULL);
priv->initialized = TRUE;
}
static void
@ -6723,9 +6728,9 @@ nm_device_set_unmanaged_quitting (NMDevice *self)
* @flag: an #NMUnmanagedFlag
* @unmanaged: %TRUE or %FALSE to set or clear @flag
*
* Like nm_device_set_unmanaged() but must be set before the device is exported
* and does not trigger state changes. Should only be used when initializing
* a device.
* Like nm_device_set_unmanaged(), but must be set before the device is
* initialized by nm_device_finish_init(), and does not trigger state changes.
* Should only be used when initializing a device.
*/
void
nm_device_set_initial_unmanaged_flag (NMDevice *self,
@ -6738,7 +6743,7 @@ nm_device_set_initial_unmanaged_flag (NMDevice *self,
g_return_if_fail (flag <= NM_UNMANAGED_LAST);
priv = NM_DEVICE_GET_PRIVATE (self);
g_return_if_fail (priv->path == NULL);
g_return_if_fail (priv->initialized == FALSE);
if (unmanaged)
priv->unmanaged_flags |= flag;