diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2017-08-31 18:23:33 +0200 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2017-09-02 10:46:14 +0200 |
| commit | 52b4df5127b3448a088dc1d149aedaec6d6009c5 (patch) | |
| tree | a2c7972f7677a416d86e53c994651bedc7d1ff91 | |
| parent | bc9269ffcb8d44d6fb54c9c1d7c5fa5637d04bac (diff) | |
| download | NetworkManager-52b4df5127b3448a088dc1d149aedaec6d6009c5.tar.gz | |
device: don't promote slave devices to managed
Previously, if a master device had internal state 'managed', we would
promote the slave to 'managed' as well. However,
- if the slave is 'external', it should stay as is because we don't
want to start managing it
- if the slave is 'assumed', it will become managed when the
activation succeeds, so it's not necessary to do it here
Fixes: 850c977953e4de3c8bbee64a3d2e8726c971761c
(cherry picked from commit 9e995905082cddbdfc85892b205f8f898cb5d437)
| -rw-r--r-- | src/devices/nm-device.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 45a71032bd..fb5963eca9 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -3692,13 +3692,6 @@ nm_device_slave_notify_enslave (NMDevice *self, gboolean success) priv->is_enslaved = TRUE; - if ( NM_IN_SET_TYPED (NMDeviceSysIfaceState, - priv->sys_iface_state, - NM_DEVICE_SYS_IFACE_STATE_EXTERNAL, - NM_DEVICE_SYS_IFACE_STATE_ASSUME) - && nm_device_sys_iface_state_get (priv->master) == NM_DEVICE_SYS_IFACE_STATE_MANAGED) - nm_device_sys_iface_state_set (self, NM_DEVICE_SYS_IFACE_STATE_MANAGED); - _notify (self, PROP_MASTER); _notify (priv->master, PROP_SLAVES); } else if (activating) { |