From 6e4b1b25cbb4e56a64c4e4ceb34052fc4a6a2be0 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 (cherry picked from commit cc7bf676eb8f3e0f98a5dbc76bd623a691be3fef) (cherry picked from commit 1bf4c3039af2af95051ff439bb29e3f77aaec709) --- src/initrd/nmi-cmdline-reader.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/initrd/nmi-cmdline-reader.c b/src/initrd/nmi-cmdline-reader.c index a5c48d64b7..165868c49e 100644 --- a/src/initrd/nmi-cmdline-reader.c +++ b/src/initrd/nmi-cmdline-reader.c @@ -593,7 +593,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,