From 6fa7f2e06c6b1ed2d4272a758440fd4888252fa1 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 23 Jul 2021 11:49:25 +0200 Subject: [PATCH] initrd: honor "ip=fw" alias for "ip=ibft" in reader_parse_ip() This alias was introduced by commit [1], without further explaination or documentation. As we already have it, implement it fully. [1] https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/commit/7a72c705acc23db85ae5fdff250fe42567029476 --- src/nm-initrd-generator/nmi-cmdline-reader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nm-initrd-generator/nmi-cmdline-reader.c b/src/nm-initrd-generator/nmi-cmdline-reader.c index 8cdabbb312..3b656bc1ba 100644 --- a/src/nm-initrd-generator/nmi-cmdline-reader.c +++ b/src/nm-initrd-generator/nmi-cmdline-reader.c @@ -644,7 +644,7 @@ reader_parse_ip(Reader *reader, const char *sysfs_dir, char *argument) NM_SETTING_IP4_CONFIG_METHOD_DISABLED, NULL); } - } else if (nm_streq0(kind, "ibft")) { + } else if (NM_IN_STRSET(kind, "fw", "ibft")) { NMSettingWired *s_wired; const char * mac = NULL; const char * ifname;