From 7e96eb5e667d73b3a92e3cbafbe005ddeb4895a3 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Tue, 30 Aug 2016 19:17:46 +0200 Subject: [PATCH] device: don't let external changes cause a release of the slave At this point we don't know if the slave has been using an assumed connection that just vanished -- the best bet is to let the device be. If it's meant to be unenslaved, it won't be due to an external event. https://bugzilla.redhat.com/show_bug.cgi?id=1357738 (cherry picked from commit 3127fb0d17bff0b250218c7bf82b4335b5290825) --- src/devices/nm-device.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 1523018740..693058e9ff 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -2628,6 +2628,7 @@ slave_state_changed (NMDevice *slave, { NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self); gboolean release = FALSE; + gboolean configure = TRUE; _LOGD (LOGD_DEVICE, "slave %s state change %d (%s) -> %d (%s)", nm_device_get_iface (slave), @@ -2650,8 +2651,12 @@ slave_state_changed (NMDevice *slave, release = TRUE; } + /* Don't touch the device if its state changed externally. */ + if (reason == NM_DEVICE_STATE_REASON_CONNECTION_ASSUMED) + configure = FALSE; + if (release) { - nm_device_master_release_one_slave (self, slave, TRUE, reason); + nm_device_master_release_one_slave (self, slave, configure, reason); /* Bridge/bond/team interfaces are left up until manually deactivated */ if (priv->slaves == NULL && priv->state == NM_DEVICE_STATE_ACTIVATED) _LOGD (LOGD_DEVICE, "last slave removed; remaining activated");