Commit 3a8cab97 authored by Beniamino Galvani's avatar Beniamino Galvani

tui: add only some options to new bond connections

Instead of adding every known option to new bond connections, only add
the ones supported by UI.
(cherry picked from commit b247950c)
(cherry picked from commit 5221af11)
parent 93bbe2a5
Pipeline #41900 passed with stage
in 40 minutes and 58 seconds
......@@ -69,14 +69,23 @@ bond_connection_setup_func (NMConnection *connection,
NMSetting *s_hw)
NMSettingBond *s_bond = NM_SETTING_BOND (s_hw);
const char **options, *def, *cur;
int i;
options = nm_setting_bond_get_valid_options (s_bond);
for (i = 0; options[i]; i++) {
const char *def, *cur;
static const char *const options[] = {
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 (g_strcmp0 (def, cur) != 0)
if (!nm_streq0 (def, cur))
nm_setting_bond_add_option (s_bond, options[i], def);
......@@ -46,6 +46,9 @@ typedef enum {
typedef struct {
NmtSlaveList *slaves;
/* Note: when adding new options to the UI also ensure they are
* initialized in bond_connection_setup_func()
NmtNewtPopup *mode;
NmtNewtEntry *primary;
NmtNewtPopup *monitoring;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment