From 82ab0fb9ac119fe0b80e322063bc8ff2c5e02bc0 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 30 Nov 2017 17:07:06 +0100 Subject: [PATCH] checkpoint: don't bypass settings-connection commit code on rollback 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 d26c749ea6188652dc01e7150354635300f7e8ad) --- src/nm-checkpoint.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/nm-checkpoint.c b/src/nm-checkpoint.c index 051e8f100a..8d323eef2b 100644 --- a/src/nm-checkpoint.c +++ b/src/nm-checkpoint.c @@ -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); }