]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
network-generator: allow specifying MAC address without MTU
authorFrantisek Sumsal <frantisek@sumsal.cz>
Mon, 6 Nov 2023 16:46:59 +0000 (17:46 +0100)
committerFrantisek Sumsal <frantisek@sumsal.cz>
Mon, 6 Nov 2023 16:46:59 +0000 (17:46 +0100)
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

index 4619a3394e1efd92f7ef40e41e8dff8d981daaa3..9bc7aa19eb6401f576811b1f956d6aeba02c35a4 100644 (file)
@@ -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);