diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-11-30 17:07:06 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-12-05 21:24:22 +0100 |
| commit | dd102e823ef4668153a6f9bf6a8b2c123a8b3602 (patch) | |
| tree | 6d8c8151320a27c5171893b391282afafe618897 | |
| parent | fd55f67f11437322c5c6f5832ba0053e29d02704 (diff) | |
| download | NetworkManager-dd102e823ef4668153a6f9bf6a8b2c123a8b3602.tar.gz | |
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)
| -rw-r--r-- | src/nm-checkpoint.c | 4 |
1 files changed, 1 insertions, 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); } |