diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2015-04-02 08:45:12 -0400 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2015-04-02 11:19:55 -0400 |
| commit | 0f71335d527622234b8c59e25fab24afadca702a (patch) | |
| tree | c6cf08518fe89f29bc6e2bab45d3d610f4668345 /src/devices | |
| parent | fa19fc0a7ab268125842f139353aac06c405e442 (diff) | |
| download | NetworkManager-0f71335d527622234b8c59e25fab24afadca702a.tar.gz | |
device: use UNMANAGED reason instead of REMOVED when unmanaging devices upon quit
Since f85513b (device: do not touch sysctls after the device was removed) the
device is not unconfigured/cleaned up when it's removed. When we're quitting
the device is not actually removed, we're just unmanaging it -- let's just
use a different reason so that the cleanup runs.
Fixes: f85513b8e4df8e88428506715ad4d0fc14e4d76a
Diffstat (limited to 'src/devices')
| -rw-r--r-- | src/devices/nm-device.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index bc5406a2ed..4edbe84503 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -7019,12 +7019,12 @@ nm_device_set_unmanaged_quitting (NMDevice *self) /* It's OK to block here because we're quitting */ if (nm_device_is_activating (self) || priv->state == NM_DEVICE_STATE_ACTIVATED) - _set_state_full (self, NM_DEVICE_STATE_DEACTIVATING, NM_DEVICE_STATE_REASON_REMOVED, TRUE); + _set_state_full (self, NM_DEVICE_STATE_DEACTIVATING, NM_DEVICE_STATE_REASON_NOW_UNMANAGED, TRUE); nm_device_set_unmanaged (self, NM_UNMANAGED_INTERNAL, TRUE, - NM_DEVICE_STATE_REASON_REMOVED); + NM_DEVICE_STATE_REASON_NOW_UNMANAGED); } /** |