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

nmcli/connections: do not remove a bond option unless reset is allowed

Browse source 
If we're setting an option with no value given and no reset allowed,
let's just set the default value.
This commit is contained in:
Lubomir Rintel 2022-06-24 00:30:04 +02:00
parent 0cb971d1d6
commit d51140d2ab
1 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/nmcli/connections.c
View file

@ -4651,7 +4651,6 @@ set_bond_option(NmCli *nmc,
GError **error)
{
NMSettingBond *s_bond;
gboolean success;
gs_free char *name = NULL;
char *p;
@ -4665,26 +4664,25 @@ set_bond_option(NmCli *nmc,
}
if (nm_str_is_empty(value)) {
nm_setting_bond_remove_option(s_bond, name);
success = TRUE;
} else
success = _nm_meta_setting_bond_add_option(NM_SETTING(s_bond), name, value, error);
if (allow_reset) {
nm_setting_bond_remove_option(s_bond, name);
return TRUE;
}
} else {
if (!_nm_meta_setting_bond_add_option(NM_SETTING(s_bond), name, value, error))
return FALSE;
}
if (!success)
return FALSE;
if (success) {
if (nm_streq(name, NM_SETTING_BOND_OPTION_MODE)) {
value = nmc_bond_validate_mode(value, error);
if (nm_streq(value, "active-backup")) {
enable_options(NM_SETTING_BOND_SETTING_NAME,
NM_SETTING_BOND_OPTIONS,
NM_MAKE_STRV("primary"));
}
if (nm_streq(name, NM_SETTING_BOND_OPTION_MODE)) {
value = nm_setting_bond_get_option_by_name(s_bond, name);
if (nm_streq(value, "active-backup")) {
enable_options(NM_SETTING_BOND_SETTING_NAME,
NM_SETTING_BOND_OPTIONS,
NM_MAKE_STRV("primary"));
}
}
return success;
return TRUE;
}
static gboolean