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

checkpoint: don't bypass settings-connection commit code on rollback

Browse source 
commit involves more then just replacing the setting and writing them
out. What? Dunno. It's complex.

But let's not bypass the commit-changes function. That one is supposed
to get it right.

(cherry picked from commit d26c749ea6)
This commit is contained in:
Thomas Haller 2017-11-30 17:07:06 +01:00
parent ed3e783e3e
commit 82ab0fb9ac
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/nm-checkpoint.c
View file

@ -254,10 +254,8 @@ activate:
if (need_update) {
_LOGD ("rollback: updating connection %s",
nm_settings_connection_get_uuid (connection));
nm_connection_replace_settings_from_connection (NM_CONNECTION (connection),
dev_checkpoint->settings_connection);
nm_settings_connection_commit_changes (connection,
NULL,
dev_checkpoint->settings_connection,
NM_SETTINGS_CONNECTION_COMMIT_REASON_NONE,
NULL);
}