diff options
| author | Antonio Cardace <acardace@redhat.com> | 2020-03-04 16:22:37 +0100 |
|---|---|---|
| committer | Antonio Cardace <acardace@redhat.com> | 2020-03-05 14:06:25 +0100 |
| commit | 59d4b9d90d401eb59e3859fa5829698dbafbc0ac (patch) | |
| tree | bbca70bb6c126436fe9fccd42342996c7a342e6d | |
| parent | 21e9703e6b6ddd1642e2a107aa17b26fab15997b (diff) | |
| download | NetworkManager-ac/fix_miimon_updelay.tar.gz | |
nmtui: only set 'mode' and enable 'miimon' when setting up a new connectionac/fix_miimon_updelay
When creating a new connection before the user gets the chance to modify
the bond options let's just initialize 'mode' and 'miimon' (with related
'updelay' and 'downdelay').
Initializing also 'arp_interval', 'arp_ip_target' and 'primary' doesn't
make much sense as by default they're disabled or contain empty values.
| -rw-r--r-- | clients/tui/nm-editor-utils.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/clients/tui/nm-editor-utils.c b/clients/tui/nm-editor-utils.c index 83fd8d3b7d..4201936170 100644 --- a/clients/tui/nm-editor-utils.c +++ b/clients/tui/nm-editor-utils.c @@ -56,24 +56,19 @@ bond_connection_setup_func (NMConnection *connection, NMSetting *s_hw) { NMSettingBond *s_bond = NM_SETTING_BOND (s_hw); - const char *def, *cur; + guint i; + const char *value; static const char *const options[] = { - NM_SETTING_BOND_OPTION_ARP_INTERVAL, - NM_SETTING_BOND_OPTION_ARP_IP_TARGET, - NM_SETTING_BOND_OPTION_DOWNDELAY, - NM_SETTING_BOND_OPTION_MIIMON, NM_SETTING_BOND_OPTION_MODE, - NM_SETTING_BOND_OPTION_PRIMARY, + NM_SETTING_BOND_OPTION_MIIMON, + NM_SETTING_BOND_OPTION_DOWNDELAY, NM_SETTING_BOND_OPTION_UPDELAY, }; - guint i; - /* Only add options supported by the UI */ for (i = 0; i < G_N_ELEMENTS (options); i++) { - def = nm_setting_bond_get_option_default (s_bond, options[i]); - cur = nm_setting_bond_get_option_by_name (s_bond, options[i]); - if (!nm_streq0 (def, cur)) - nm_setting_bond_add_option (s_bond, options[i], def); + value = nm_setting_bond_get_option_default (s_bond, options[i]); + if (value) + nm_setting_bond_add_option (s_bond, options[i], value); } } |