fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-05 01:47:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

initrd: apply the MTU from bond= argument to the bond connection

Browse source 
Currently the MTU specified in:

 bond=<bondname>[:<bondslaves>:[:<options>[:<mtu>]]]

gets applied to the bond ports. Instead it should be applied to the
bond itself.

Fixes: ecc074b2f8 ('initrd: add command line parser')

https://bugzilla.redhat.com/show_bug.cgi?id=1932502
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/767
This commit is contained in:
Beniamino Galvani 2021-03-01 21:16:08 +01:00
parent 7ad2b8f20a
commit 8df3ef5063
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/core/initrd/nmi-cmdline-reader.c
View file

@ -757,6 +757,9 @@ reader_parse_master(Reader *reader, char *argument, const char *type_name, const
mtu = get_word(&argument, ':'); mtu = get_word(&argument, ':');
} }
if (mtu)
connection_set(connection, NM_SETTING_WIRED_SETTING_NAME, NM_SETTING_WIRED_MTU, mtu);
do { do {
slave = get_word(&slaves, ','); slave = get_word(&slaves, ',');
if (slave == NULL) if (slave == NULL)
@ -770,8 +773,6 @@ reader_parse_master(Reader *reader, char *argument, const char *type_name, const
NM_SETTING_CONNECTION_MASTER, NM_SETTING_CONNECTION_MASTER,
master, master,
NULL); NULL);
if (mtu)
connection_set(connection, NM_SETTING_WIRED_SETTING_NAME, NM_SETTING_WIRED_MTU, mtu);
} while (slaves && *slaves != '\0'); } while (slaves && *slaves != '\0');
if (argument && *argument) if (argument && *argument)

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

@ -825,13 +825,14 @@ test_bond(void)
{ {
gs_unref_hashtable GHashTable *connections = NULL; gs_unref_hashtable GHashTable *connections = NULL;
const char *const * ARGV = NM_MAKE_STRV("rd.route=192.0.2.53::bong0", const char *const * ARGV = NM_MAKE_STRV("rd.route=192.0.2.53::bong0",
"bond=bong0:eth0,eth1:mode=balance-rr", "bond=bong0:eth0,eth1:mode=balance-rr:9000",
"nameserver=203.0.113.53"); "nameserver=203.0.113.53");
NMConnection * connection; NMConnection * connection;
NMSettingConnection * s_con; NMSettingConnection * s_con;
NMSettingIPConfig * s_ip4; NMSettingIPConfig * s_ip4;
NMSettingIPConfig * s_ip6; NMSettingIPConfig * s_ip6;
NMSettingBond * s_bond; NMSettingBond * s_bond;
NMSettingWired * s_wired;
NMIPRoute * ip_route; NMIPRoute * ip_route;
const char * master_uuid; const char * master_uuid;
@ -847,6 +848,10 @@ test_bond(void)
master_uuid = nm_connection_get_uuid(connection); master_uuid = nm_connection_get_uuid(connection);
g_assert(master_uuid); g_assert(master_uuid);
s_wired = nm_connection_get_setting_wired(connection);
g_assert(s_wired);
g_assert_cmpint(nm_setting_wired_get_mtu(s_wired), ==, 9000);
s_ip4 = nm_connection_get_setting_ip4_config(connection); s_ip4 = nm_connection_get_setting_ip4_config(connection);
g_assert(s_ip4); g_assert(s_ip4);
g_assert_cmpstr(nm_setting_ip_config_get_method(s_ip4), ==, NM_SETTING_IP4_CONFIG_METHOD_AUTO); g_assert_cmpstr(nm_setting_ip_config_get_method(s_ip4), ==, NM_SETTING_IP4_CONFIG_METHOD_AUTO);