From 28770eb394e64fb1a5553f55bfc2ba8d0f6fb573 Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Wed, 13 Oct 2021 15:02:56 +0200 Subject: [PATCH] initrd: handle ip=dhcp,dhcp6 specially With "ip=dhcp,dhcp6" the legacy dracut module does first DHCPv4 and then IPv6 autoconf (even if DHCPv4 succeeded) [1]. In this way, there is the guarantee that an address family is always configured if the network supports it. Currently "ip=dhcp,dhcp6" is treated a bit differently by NM, which generates a connection with only ipv4.required-timeout=20s. Therefore it's possible that NM in initrd quits (or signals startup-complete) without an IPv6 even if the network is configured for IPv6. Make NM's behavior similar to the legacy module by also setting an ipv6.required-timeout for "ip=dhcp,dhcp6". Note that if the command line contains "rd.neednet=1" without an "ip=" argument, we still generate a default connection with IPv4 preferred over IPv6 (i.e. only ipv4.required-timeout set). That's similar to what the legacy module does [2]. See [3] for a description of different scenarios for "rd.neednet=1". [1] https://github.com/dracutdevs/dracut/blob/055/modules.d/35network-legacy/ifup.sh#L459-L484 [2] https://github.com/dracutdevs/dracut/blob/055/modules.d/35network-legacy/ifup.sh#L529-L537 [3] https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/729 https://bugzilla.redhat.com/show_bug.cgi?id=1961666 https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/994 --- src/nm-initrd-generator/nmi-cmdline-reader.c | 19 +++++++++++++++---- .../tests/test-cmdline-reader.c | 6 ++++++ 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/src/nm-initrd-generator/nmi-cmdline-reader.c b/src/nm-initrd-generator/nmi-cmdline-reader.c index ced1eeddf2..8fafb08f53 100644 --- a/src/nm-initrd-generator/nmi-cmdline-reader.c +++ b/src/nm-initrd-generator/nmi-cmdline-reader.c @@ -496,11 +496,12 @@ _parse_ip_method(const char *kind) /* only certain combinations are allowed... those are listed * and mapped to a canonical value. - * - * For the moment, these map all to "auto". This might be revisited - * in the future to add new kinds like "dhcp+local6". */ + */ if (_strv_is_same_unordered(strv, "dhcp", "dhcp6")) - return "auto"; + return "dhcp4+auto6"; + /* For the moment, this maps to "auto". This might be revisited + * in the future to add new kinds like "dhcp+local6" + */ if (_strv_is_same_unordered(strv, "dhcp", "local6")) return "auto"; @@ -744,6 +745,16 @@ reader_parse_ip(Reader *reader, const char *sysfs_dir, char *argument) NM_SETTING_IP4_CONFIG_METHOD_DISABLED, NULL); } + } else if (nm_streq(kind, "dhcp4+auto6")) { + /* Both DHCPv4 and IPv6 autoconf are enabled, and + * each of them is tried for at least IP_REQUIRED_TIMEOUT_MSEC, + * even if the other one completes before. + */ + clear_ip4_required_timeout = FALSE; + g_object_set(s_ip6, + NM_SETTING_IP_CONFIG_REQUIRED_TIMEOUT, + NMI_IP_REQUIRED_TIMEOUT_MSEC, + NULL); } else if (nm_streq(kind, "link6")) { g_object_set(s_ip6, NM_SETTING_IP_CONFIG_METHOD, diff --git a/src/nm-initrd-generator/tests/test-cmdline-reader.c b/src/nm-initrd-generator/tests/test-cmdline-reader.c index d8bbb5e86b..2cb1b2f49d 100644 --- a/src/nm-initrd-generator/tests/test-cmdline-reader.c +++ b/src/nm-initrd-generator/tests/test-cmdline-reader.c @@ -324,11 +324,17 @@ test_if_auto_with_mtu(void) g_assert_cmpstr(nm_setting_ip_config_get_method(s_ip4), ==, NM_SETTING_IP4_CONFIG_METHOD_AUTO); g_assert(!nm_setting_ip_config_get_ignore_auto_dns(s_ip4)); g_assert_cmpint(nm_setting_ip_config_get_dhcp_timeout(s_ip4), ==, 90); + g_assert_cmpint(nm_setting_ip_config_get_required_timeout(s_ip4), + ==, + NMI_IP_REQUIRED_TIMEOUT_MSEC); s_ip6 = nm_connection_get_setting_ip6_config(connection); g_assert(s_ip6); g_assert_cmpstr(nm_setting_ip_config_get_method(s_ip6), ==, NM_SETTING_IP6_CONFIG_METHOD_AUTO); g_assert(!nm_setting_ip_config_get_ignore_auto_dns(s_ip6)); + g_assert_cmpint(nm_setting_ip_config_get_required_timeout(s_ip6), + ==, + NMI_IP_REQUIRED_TIMEOUT_MSEC); } static void