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

settings: fix passing force_rename flag to _update_connection_to_plugin()

Browse source 
No bad effects so far, it was unused.

But as it wasn't used, also no longer set the update_reason flag
NM_SETTINGS_CONNECTION_UPDATE_REASON_FORCE_RENAME. We didn't have the
force-rename behavior so far. This makes the flag totally unused, and
maybe should be dropped. It's kept for now, if only to show what could
be done.
This commit is contained in:
Thomas Haller 2023-06-26 22:31:30 +02:00
parent e5a6e16ce0
commit 3d2622c358
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
3 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/core/settings/nm-settings-connection.c
View file

@ -1582,10 +1582,9 @@ update_auth_cb(NMSettingsConnection *self,
: NM_SETTINGS_CONNECTION_INT_FLAGS_NONE),
NM_SETTINGS_CONNECTION_INT_FLAGS_NM_GENERATED | NM_SETTINGS_CONNECTION_INT_FLAGS_VOLATILE
| NM_SETTINGS_CONNECTION_INT_FLAGS_EXTERNAL,
NM_SETTINGS_CONNECTION_UPDATE_REASON_FORCE_RENAME
| (NM_FLAGS_HAS(info->flags, NM_SETTINGS_UPDATE2_FLAG_NO_REAPPLY)
? NM_SETTINGS_CONNECTION_UPDATE_REASON_NONE
: NM_SETTINGS_CONNECTION_UPDATE_REASON_REAPPLY_PARTIAL)
(NM_FLAGS_HAS(info->flags, NM_SETTINGS_UPDATE2_FLAG_NO_REAPPLY)
? NM_SETTINGS_CONNECTION_UPDATE_REASON_NONE
: NM_SETTINGS_CONNECTION_UPDATE_REASON_REAPPLY_PARTIAL)
| NM_SETTINGS_CONNECTION_UPDATE_REASON_RESET_SYSTEM_SECRETS
| NM_SETTINGS_CONNECTION_UPDATE_REASON_RESET_AGENT_SECRETS
| NM_SETTINGS_CONNECTION_UPDATE_REASON_UPDATE_NON_SECRET

21
src/core/settings/nm-settings.c
View file

@ -2263,16 +2263,17 @@ nm_settings_update_connection(NMSettings *self,
drop_storage,
&local);
} else {
success = _update_connection_to_plugin(self,
update_storage,
connection,
new_flags,
update_reason,
new_shadowed_storage_filename,
new_shadowed_owned,
&new_storage,
&new_connection,
&local);
success = _update_connection_to_plugin(
self,
update_storage,
connection,
new_flags,
NM_FLAGS_HAS(update_reason, NM_SETTINGS_CONNECTION_UPDATE_REASON_FORCE_RENAME),
new_shadowed_storage_filename,
new_shadowed_owned,
&new_storage,
&new_connection,
&local);
}
if (!success) {
gboolean ignore_failure;

2
src/core/settings/plugins/keyfile/nms-keyfile-plugin.c
View file

@ -910,6 +910,8 @@ nms_keyfile_plugin_update_connection(NMSKeyfilePlugin *self,
previous_filename = nms_keyfile_storage_get_filename(storage);
uuid = nms_keyfile_storage_get_uuid(storage);
/* FIXME: force_rename is unused so far. */
if (!nms_keyfile_writer_connection(
connection,
is_nm_generated,