diff options
Diffstat (limited to 'src/nm-initrd-generator')
| -rw-r--r-- | src/nm-initrd-generator/README.md | 12 | ||||
| -rw-r--r-- | src/nm-initrd-generator/nmi-cmdline-reader.c | 2 | ||||
| -rw-r--r-- | src/nm-initrd-generator/tests/test-cmdline-reader.c | 22 |
3 files changed, 24 insertions, 12 deletions
diff --git a/src/nm-initrd-generator/README.md b/src/nm-initrd-generator/README.md new file mode 100644 index 00000000..cc995f5f --- /dev/null +++ b/src/nm-initrd-generator/README.md @@ -0,0 +1,12 @@ +nm-initrd-generator +=================== + +A command line tool that generates NetworkManager configuration. + +This is supposed to be run by dracut in initrd, before NetworkManager +starts. It parses the kernel command line, generates configuration +and quits. + +See: +- `man 8 nm-initrd-generator` ([[www]](https://networkmanager.dev/docs/api/latest/nm-initrd-generator.html)) +- `man 7 dracut.cmdline` diff --git a/src/nm-initrd-generator/nmi-cmdline-reader.c b/src/nm-initrd-generator/nmi-cmdline-reader.c index 1c35a905..8fcfc6d0 100644 --- a/src/nm-initrd-generator/nmi-cmdline-reader.c +++ b/src/nm-initrd-generator/nmi-cmdline-reader.c @@ -240,7 +240,7 @@ reader_get_connection(Reader *reader, candidate = g_hash_table_lookup(reader->hash, reader->array->pdata[i]); s_con = nm_connection_get_setting_connection(candidate); - if (type_name == NULL && nm_setting_connection_get_master(s_con) == NULL) { + if (type_name == NULL && nm_setting_connection_get_controller(s_con) == NULL) { connection = candidate; break; } diff --git a/src/nm-initrd-generator/tests/test-cmdline-reader.c b/src/nm-initrd-generator/tests/test-cmdline-reader.c index fd663b6d..1f2141e6 100644 --- a/src/nm-initrd-generator/tests/test-cmdline-reader.c +++ b/src/nm-initrd-generator/tests/test-cmdline-reader.c @@ -1032,7 +1032,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_port_type(s_con), ==, NM_SETTING_BOND_SETTING_NAME); - g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid); + g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, master_uuid); g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con), ==, NM_CONNECTION_MULTI_CONNECT_SINGLE); @@ -1048,7 +1048,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_port_type(s_con), ==, NM_SETTING_BOND_SETTING_NAME); - g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid); + g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, master_uuid); g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con), ==, NM_CONNECTION_MULTI_CONNECT_SINGLE); @@ -1130,7 +1130,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_port_type(s_con), ==, NM_SETTING_BOND_SETTING_NAME); - g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid); + g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, master_uuid); g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con), ==, NM_CONNECTION_MULTI_CONNECT_SINGLE); @@ -1146,7 +1146,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_port_type(s_con), ==, NM_SETTING_BOND_SETTING_NAME); - g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid); + g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, master_uuid); g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con), ==, NM_CONNECTION_MULTI_CONNECT_SINGLE); @@ -1209,7 +1209,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_port_type(s_con), ==, NM_SETTING_BOND_SETTING_NAME); - g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid); + g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, master_uuid); g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con), ==, NM_CONNECTION_MULTI_CONNECT_SINGLE); @@ -1285,7 +1285,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_port_type(s_con), ==, NM_SETTING_BRIDGE_SETTING_NAME); - g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid); + g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, master_uuid); g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con), ==, NM_CONNECTION_MULTI_CONNECT_SINGLE); @@ -1301,7 +1301,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_port_type(s_con), ==, NM_SETTING_BRIDGE_SETTING_NAME); - g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid); + g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, master_uuid); g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con), ==, NM_CONNECTION_MULTI_CONNECT_SINGLE); @@ -1362,7 +1362,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_port_type(s_con), ==, NM_SETTING_BRIDGE_SETTING_NAME); - g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid); + g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, master_uuid); g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con), ==, NM_CONNECTION_MULTI_CONNECT_SINGLE); @@ -1430,7 +1430,7 @@ test_bridge_ip(void) 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_cmpstr(nm_setting_connection_get_controller(s_con), ==, master_uuid); g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con), ==, NM_CONNECTION_MULTI_CONNECT_SINGLE); @@ -1494,7 +1494,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_port_type(s_con), ==, NM_SETTING_TEAM_SETTING_NAME); - g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid); + g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, master_uuid); g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con), ==, NM_CONNECTION_MULTI_CONNECT_SINGLE); @@ -1510,7 +1510,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_port_type(s_con), ==, NM_SETTING_TEAM_SETTING_NAME); - g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid); + g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, master_uuid); g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con), ==, NM_CONNECTION_MULTI_CONNECT_SINGLE); |