From 5dd48f7527c67b399ac144f594e035216771d61c Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Wed, 3 Dec 2014 10:21:11 -0500 Subject: [PATCH] devices: don't release slaves on exit (rh #1169936) 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.) --- src/devices/nm-device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); }