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

initrd: default bridge name to br0 as opposed to bridge0

Browse source 
For compatibility. The dracut.cmdline(7) manual says:

  Bridge without parameters assumes bridge=br0:eth0

(cherry picked from commit f581756af6)
This commit is contained in:
Lubomir Rintel 2019-11-07 15:29:31 +01:00
parent e19138b94c
commit d7101d8342
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/initrd/nmi-cmdline-reader.c
View file

@ -480,7 +480,10 @@ parse_ip (GHashTable *connections, const char *sysfs_dir, char *argument)
}
static void
parse_master (GHashTable *connections, char *argument, const char *type_name)
parse_master (GHashTable *connections,
char *argument,
const char *type_name,
const char *default_name)
{
NMConnection *connection;
NMSettingConnection *s_con;
@ -496,7 +499,7 @@ parse_master (GHashTable *connections, char *argument, const char *type_name)
master = get_word (&argument, ':');
if (!master)
master = master_to_free = g_strdup_printf ("%s0", type_name);
master = master_to_free = g_strdup_printf ("%s0", default_name ?: type_name);
slaves = get_word (&argument, ':');
connection = get_conn (connections, master, type_name);
@ -803,11 +806,11 @@ nmi_cmdline_reader_parse (const char *sysfs_dir, const char *const*argv)
else if (strcmp (tag, "rd.route") == 0)
parse_rd_route (connections, argument);
else if (strcmp (tag, "bridge") == 0)
parse_master (connections, argument, NM_SETTING_BRIDGE_SETTING_NAME);
parse_master (connections, argument, NM_SETTING_BRIDGE_SETTING_NAME, "br");
else if (strcmp (tag, "bond") == 0)
parse_master (connections, argument, NM_SETTING_BOND_SETTING_NAME);
parse_master (connections, argument, NM_SETTING_BOND_SETTING_NAME, NULL);
else if (strcmp (tag, "team") == 0)
parse_master (connections, argument, NM_SETTING_TEAM_SETTING_NAME);
parse_master (connections, argument, NM_SETTING_TEAM_SETTING_NAME, NULL);
else if (strcmp (tag, "vlan") == 0)
parse_vlan (connections, argument);
else if (strcmp (tag, "bootdev") == 0)

4
src/initrd/tests/test-cmdline-reader.c
View file

@ -651,12 +651,12 @@ test_bridge_default (void)
g_assert (connections);
g_assert_cmpint (g_hash_table_size (connections), ==, 2);
connection = g_hash_table_lookup (connections, "bridge0");
connection = g_hash_table_lookup (connections, "br0");
g_assert (connection);
nmtst_assert_connection_verifies_without_normalization (connection);
g_assert_cmpstr (nm_connection_get_connection_type (connection), ==, NM_SETTING_BRIDGE_SETTING_NAME);
g_assert_cmpstr (nm_connection_get_id (connection), ==, "bridge0");
g_assert_cmpstr (nm_connection_get_id (connection), ==, "br0");
master_uuid = nm_connection_get_uuid (connection);
g_assert (master_uuid);