fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-31 20:20:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

manager: don't save deactivating connections in the state file

Browse source 
Especially with configure-and-quit, it's easy to encounter a condition,
where the device reached a failed state, policy decides to quit, but the
active connection is not yet torn down from the device.

Upon the next start NetworkManager would think the connection succeeded
activating.

(cherry picked from commit e98ebc7e3b)
This commit is contained in:
Lubomir Rintel 2018-07-04 19:19:38 +02:00
parent a3686b1dda
commit 5865d01117
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/nm-manager.c
View file

@ -6246,7 +6246,8 @@ nm_manager_write_device_state (NMManager *self, NMDevice *device)
if (managed) {
NMSettingsConnection *sett_conn;
sett_conn = nm_device_get_settings_connection (device);
if (nm_device_get_state (device) <= NM_DEVICE_STATE_ACTIVATED)
sett_conn = nm_device_get_settings_connection (device);
if (sett_conn)
uuid = nm_settings_connection_get_uuid (sett_conn);
managed_type = NM_CONFIG_DEVICE_STATE_MANAGED_TYPE_MANAGED;