From cc7bf676eb8f3e0f98a5dbc76bd623a691be3fef Mon Sep 17 00:00:00 2001 From: Jonas Jelten Date: Thu, 23 Jul 2020 21:37:36 +0200 Subject: [PATCH] initrd: fix auto-establishment for dhcp6 and auto6 methods Fixes: ecc074b2f8a6 ('initrd: add command line parser') https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/586 --- src/core/initrd/nmi-cmdline-reader.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/core/initrd/nmi-cmdline-reader.c b/src/core/initrd/nmi-cmdline-reader.c index 15b4af7b70..d693836baf 100644 --- a/src/core/initrd/nmi-cmdline-reader.c +++ b/src/core/initrd/nmi-cmdline-reader.c @@ -613,7 +613,12 @@ reader_parse_ip(Reader *reader, const char *sysfs_dir, char *argument) NULL); } } else if (NM_IN_STRSET(kind, "auto6", "dhcp6")) { - g_object_set(s_ip6, NM_SETTING_IP_CONFIG_MAY_FAIL, FALSE, NULL); + g_object_set(s_ip6, + NM_SETTING_IP_CONFIG_METHOD, + NM_SETTING_IP6_CONFIG_METHOD_AUTO, + NM_SETTING_IP_CONFIG_MAY_FAIL, + FALSE, + NULL); if (nm_setting_ip_config_get_num_addresses(s_ip4) == 0) { g_object_set(s_ip4, NM_SETTING_IP_CONFIG_METHOD,