diff options
| author | Dan Winship <danw@redhat.com> | 2014-12-03 10:21:11 -0500 |
|---|---|---|
| committer | Dan Winship <danw@redhat.com> | 2014-12-03 10:26:07 -0500 |
| commit | 3f689d8cfd632b6bad99358804ff20456f641680 (patch) | |
| tree | f1e51f18998e8f6cc707bad27feb17ea3ac547a0 | |
| parent | 1a4259d23af7f645f9bc78725e88506564961090 (diff) | |
| download | NetworkManager-danw/slave-removed-rh1169936.tar.gz | |
devices: don't release slaves on exit (rh #1169936)danw/slave-removed-rh1169936
nm_device_removed() calls nm_device_release_one_slave() in order to
fix up NetworkManager's master/slave bookkeeping, but we don't want to
tell the kernel to actually unslave the device, since that would
happen automatically anyway if the device was really removed, and
shouldn't happen if the device is just being removed from NM's device
list.
(In particular, don't remove all libvirt-created virtual network
devices from virbr0 when NetworkManager exits.)
| -rw-r--r-- | src/devices/nm-device.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 3e8f7ed503..f56cf2e52a 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -1623,7 +1623,7 @@ nm_device_removed (NMDevice *self) NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self); if (priv->enslaved) - nm_device_release_one_slave (priv->master, self, TRUE, NM_DEVICE_STATE_REASON_REMOVED); + nm_device_release_one_slave (priv->master, self, FALSE, NM_DEVICE_STATE_REASON_REMOVED); } |