diff options
Diffstat (limited to 'src/nm-initrd-generator')
| -rw-r--r-- | src/nm-initrd-generator/nmi-cmdline-reader.c | 10 | ||||
| -rw-r--r-- | src/nm-initrd-generator/tests/test-cmdline-reader.c | 28 |
2 files changed, 16 insertions, 22 deletions
diff --git a/src/nm-initrd-generator/nmi-cmdline-reader.c b/src/nm-initrd-generator/nmi-cmdline-reader.c index 68fe7004..7bb7e43e 100644 --- a/src/nm-initrd-generator/nmi-cmdline-reader.c +++ b/src/nm-initrd-generator/nmi-cmdline-reader.c @@ -486,12 +486,12 @@ _parse_ip_method(const char *kind) nm_strv_sort(strv, -1); nm_strv_cleanup_const(strv, TRUE, TRUE); - if (nm_strv_find_first(strv, -1, "auto") >= 0) { + if (nm_strv_contains(strv, -1, "auto")) { /* if "auto" is present, then "dhcp4", "dhcp6", and "local6" is implied. */ _strv_remove(strv, "dhcp4"); _strv_remove(strv, "dhcp6"); _strv_remove(strv, "local6"); - } else if (nm_strv_find_first(strv, -1, "dhcp6") >= 0) { + } else if (nm_strv_contains(strv, -1, "dhcp6")) { /* if "dhcp6" is present, then "local6" is implied. */ _strv_remove(strv, "local6"); } @@ -924,9 +924,9 @@ reader_parse_master(Reader *reader, char *argument, const char *type_name, const connection = reader_get_connection(reader, slave, NULL, TRUE); s_con = nm_connection_get_setting_connection(connection); g_object_set(s_con, - NM_SETTING_CONNECTION_SLAVE_TYPE, + NM_SETTING_CONNECTION_PORT_TYPE, type_name, - NM_SETTING_CONNECTION_MASTER, + NM_SETTING_CONNECTION_CONTROLLER, master, NULL); } while (slaves && *slaves != '\0'); @@ -1435,7 +1435,7 @@ nmi_cmdline_reader_parse(const char *etc_connections_dir, } } - reader->dhcp_timeout = NM_CLAMP(dhcp_timeout * dhcp_num_tries, 1, G_MAXINT32); + reader->dhcp_timeout = NM_CLAMP(dhcp_timeout * dhcp_num_tries, 1u, (guint32) G_MAXINT32); for (i = 0; argv[i]; i++) { gs_free char *argument_clone = NULL; diff --git a/src/nm-initrd-generator/tests/test-cmdline-reader.c b/src/nm-initrd-generator/tests/test-cmdline-reader.c index 7124d74e..3dbbd4d5 100644 --- a/src/nm-initrd-generator/tests/test-cmdline-reader.c +++ b/src/nm-initrd-generator/tests/test-cmdline-reader.c @@ -1031,7 +1031,7 @@ test_bond(void) ==, NM_SETTING_WIRED_SETTING_NAME); g_assert_cmpstr(nm_setting_connection_get_id(s_con), ==, "eth0"); - g_assert_cmpstr(nm_setting_connection_get_slave_type(s_con), ==, NM_SETTING_BOND_SETTING_NAME); + g_assert_cmpstr(nm_setting_connection_get_port_type(s_con), ==, NM_SETTING_BOND_SETTING_NAME); g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid); g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con), ==, @@ -1047,7 +1047,7 @@ test_bond(void) ==, NM_SETTING_WIRED_SETTING_NAME); g_assert_cmpstr(nm_setting_connection_get_id(s_con), ==, "eth1"); - g_assert_cmpstr(nm_setting_connection_get_slave_type(s_con), ==, NM_SETTING_BOND_SETTING_NAME); + g_assert_cmpstr(nm_setting_connection_get_port_type(s_con), ==, NM_SETTING_BOND_SETTING_NAME); g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid); g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con), ==, @@ -1129,7 +1129,7 @@ test_bond_ip(void) ==, NM_SETTING_WIRED_SETTING_NAME); g_assert_cmpstr(nm_setting_connection_get_id(s_con), ==, "eth0"); - g_assert_cmpstr(nm_setting_connection_get_slave_type(s_con), ==, NM_SETTING_BOND_SETTING_NAME); + g_assert_cmpstr(nm_setting_connection_get_port_type(s_con), ==, NM_SETTING_BOND_SETTING_NAME); g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid); g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con), ==, @@ -1145,7 +1145,7 @@ test_bond_ip(void) ==, NM_SETTING_WIRED_SETTING_NAME); g_assert_cmpstr(nm_setting_connection_get_id(s_con), ==, "eth1"); - g_assert_cmpstr(nm_setting_connection_get_slave_type(s_con), ==, NM_SETTING_BOND_SETTING_NAME); + g_assert_cmpstr(nm_setting_connection_get_port_type(s_con), ==, NM_SETTING_BOND_SETTING_NAME); g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid); g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con), ==, @@ -1208,7 +1208,7 @@ test_bond_default(void) ==, NM_SETTING_WIRED_SETTING_NAME); g_assert_cmpstr(nm_setting_connection_get_id(s_con), ==, "eth0"); - g_assert_cmpstr(nm_setting_connection_get_slave_type(s_con), ==, NM_SETTING_BOND_SETTING_NAME); + g_assert_cmpstr(nm_setting_connection_get_port_type(s_con), ==, NM_SETTING_BOND_SETTING_NAME); g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid); g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con), ==, @@ -1284,9 +1284,7 @@ test_bridge(void) ==, NM_SETTING_WIRED_SETTING_NAME); g_assert_cmpstr(nm_setting_connection_get_id(s_con), ==, "eth0"); - g_assert_cmpstr(nm_setting_connection_get_slave_type(s_con), - ==, - NM_SETTING_BRIDGE_SETTING_NAME); + g_assert_cmpstr(nm_setting_connection_get_port_type(s_con), ==, NM_SETTING_BRIDGE_SETTING_NAME); g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid); g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con), ==, @@ -1302,9 +1300,7 @@ test_bridge(void) ==, NM_SETTING_WIRED_SETTING_NAME); g_assert_cmpstr(nm_setting_connection_get_id(s_con), ==, "eth1"); - g_assert_cmpstr(nm_setting_connection_get_slave_type(s_con), - ==, - NM_SETTING_BRIDGE_SETTING_NAME); + g_assert_cmpstr(nm_setting_connection_get_port_type(s_con), ==, NM_SETTING_BRIDGE_SETTING_NAME); g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid); g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con), ==, @@ -1365,9 +1361,7 @@ test_bridge_default(void) ==, NM_SETTING_WIRED_SETTING_NAME); g_assert_cmpstr(nm_setting_connection_get_id(s_con), ==, "eth0"); - g_assert_cmpstr(nm_setting_connection_get_slave_type(s_con), - ==, - NM_SETTING_BRIDGE_SETTING_NAME); + g_assert_cmpstr(nm_setting_connection_get_port_type(s_con), ==, NM_SETTING_BRIDGE_SETTING_NAME); g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid); g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con), ==, @@ -1433,7 +1427,7 @@ test_bridge_ip(void) ==, NM_SETTING_WIRED_SETTING_NAME); g_assert_cmpstr(nm_setting_connection_get_id(s_con), ==, ifname); - g_assert_cmpstr(nm_setting_connection_get_slave_type(s_con), + g_assert_cmpstr(nm_setting_connection_get_port_type(s_con), ==, NM_SETTING_BRIDGE_SETTING_NAME); g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid); @@ -1499,7 +1493,7 @@ test_team(void) ==, NM_SETTING_WIRED_SETTING_NAME); g_assert_cmpstr(nm_setting_connection_get_id(s_con), ==, "eth0"); - g_assert_cmpstr(nm_setting_connection_get_slave_type(s_con), ==, NM_SETTING_TEAM_SETTING_NAME); + g_assert_cmpstr(nm_setting_connection_get_port_type(s_con), ==, NM_SETTING_TEAM_SETTING_NAME); g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid); g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con), ==, @@ -1515,7 +1509,7 @@ test_team(void) ==, NM_SETTING_WIRED_SETTING_NAME); g_assert_cmpstr(nm_setting_connection_get_id(s_con), ==, "eth1"); - g_assert_cmpstr(nm_setting_connection_get_slave_type(s_con), ==, NM_SETTING_TEAM_SETTING_NAME); + g_assert_cmpstr(nm_setting_connection_get_port_type(s_con), ==, NM_SETTING_TEAM_SETTING_NAME); g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid); g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con), ==, |