fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-06 02:18:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

initrd: generate ipv6.method=ignore connection with ip=dhcp

Browse source 
The legacy network module used to leave kernel IPv6 autoconfiguration
enabled with ip=dhcp. Do the same for backwards compatibility.

https://github.com/dracutdevs/dracut/issues/700
This commit is contained in:
Beniamino Galvani 2020-03-23 18:13:40 +01:00
parent d0e0213a08
commit bba7663407
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -392,7 +392,7 @@ parse_ip (GHashTable *connections, const char *sysfs_dir, char *argument)
NULL);
if (nm_setting_ip_config_get_num_addresses (s_ip6) == 0) {
g_object_set (s_ip6,
NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP6_CONFIG_METHOD_DISABLED,
NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP6_CONFIG_METHOD_IGNORE,
NULL);
}
} else if (g_strcmp0 (kind, "dhcp6") == 0) {

4
src/initrd/tests/test-cmdline-reader.c
View file

@ -991,7 +991,7 @@ test_bootif (void)
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_DISABLED);
g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip6), ==, NM_SETTING_IP6_CONFIG_METHOD_IGNORE);
g_assert (!nm_setting_ip_config_get_ignore_auto_dns (s_ip6));
}
@ -1027,7 +1027,7 @@ test_bootif_hwtype (void)
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_DISABLED);
g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip6), ==, NM_SETTING_IP6_CONFIG_METHOD_IGNORE);
g_assert (!nm_setting_ip_config_get_ignore_auto_dns (s_ip6));
connection = g_hash_table_lookup (connections, "bootif_connection");