diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2017-08-31 18:29:42 +0200 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2017-09-02 10:46:16 +0200 |
| commit | ac7d908d365ac5abcb3f8fcb16b3a26af8e43840 (patch) | |
| tree | bab153138c701c8f72d23901e1e11d3349f661f3 | |
| parent | 52b4df5127b3448a088dc1d149aedaec6d6009c5 (diff) | |
| download | NetworkManager-ac7d908d365ac5abcb3f8fcb16b3a26af8e43840.tar.gz | |
device: don't release external slaves on state change
If the slave is 'external' we should never touch it, in particular we
should not release the link from its master; we only have to remove it
from master's list.
https://bugzilla.redhat.com/show_bug.cgi?id=1442361
(cherry picked from commit 981f90e32425bc9cf2086cdd9b160942a5a6f8ee)
| -rw-r--r-- | src/devices/nm-device.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index fb5963eca9..bacbfb33e1 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -3422,6 +3422,7 @@ slave_state_changed (NMDevice *slave, { NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self); gboolean release = FALSE; + gboolean configure; _LOGD (LOGD_DEVICE, "slave %s state change %d (%s) -> %d (%s)", nm_device_get_iface (slave), @@ -3445,8 +3446,11 @@ slave_state_changed (NMDevice *slave, } if (release) { + configure = priv->sys_iface_state == NM_DEVICE_SYS_IFACE_STATE_MANAGED + && nm_device_sys_iface_state_get (slave) != NM_DEVICE_SYS_IFACE_STATE_EXTERNAL; + nm_device_master_release_one_slave (self, slave, - priv->sys_iface_state == NM_DEVICE_SYS_IFACE_STATE_MANAGED, + configure, reason); /* Bridge/bond/team interfaces are left up until manually deactivated */ if (priv->slaves == NULL && priv->state == NM_DEVICE_STATE_ACTIVATED) |