fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-03-01 11:30:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

initrd: fix auto-establishment for dhcp6 and auto6 methods

Browse source 
Fixes: ecc074b2f8 ('initrd: add command line parser')

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/586
(cherry picked from commit cc7bf676eb)
(cherry picked from commit 1bf4c3039a)
(cherry picked from commit 6e4b1b25cb)
This commit is contained in:
Jonas Jelten 2020-07-23 21:37:36 +02:00 • committed by Thomas Haller
parent de206aeef8
commit 3dfd8fe3c4
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/initrd/nmi-cmdline-reader.c
View file

@ -552,9 +552,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, NM_SETTING_IP4_CONFIG_METHOD_DISABLED,