From cc5244716baac64e92a1aac5d118c41ac7f82a00 Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Mon, 6 Nov 2023 17:46:59 +0100 Subject: [PATCH] network-generator: allow specifying MAC address without MTU Also, don't panic when both optional arguments are empty. This should make the syntax compatible-ish with the dracut one from dracut.cmdline(7). Resolves: #29855 --- src/network/generator/network-generator.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/network/generator/network-generator.c b/src/network/generator/network-generator.c index 4619a3394e1..9bc7aa19eb6 100644 --- a/src/network/generator/network-generator.c +++ b/src/network/generator/network-generator.c @@ -528,11 +528,13 @@ static int parse_cmdline_ip_mtu_mac(Context *context, const char *ifname, int fa else mtu = strndupa_safe(value, p - value); - r = network_set_mtu(context, ifname, family, mtu); - if (r < 0) - return r; + if (!isempty(mtu)) { + r = network_set_mtu(context, ifname, family, mtu); + if (r < 0) + return r; + } - if (!p) + if (!p || isempty(p + 1)) return 0; r = network_set_mac_address(context, ifname, p + 1); -- 2.47.3