diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2019-04-26 13:25:21 +0200 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2019-06-11 16:22:04 +0200 |
| commit | e6628fa27c25e0b1b49826db67c8af64957b716d (patch) | |
| tree | cf4ffc3d088a4ab29dfb176a13d54314d1720876 /src/initrd | |
| parent | 5be69ba79470f35ca2b10f0e189a0a5a3fac6f28 (diff) | |
| download | NetworkManager-e6628fa27c25e0b1b49826db67c8af64957b716d.tar.gz | |
ipv6: add 'disabled' method
Add a new ipv6.method value 'disabled' that completely disables IPv6
for the interface.
https://bugzilla.redhat.com/show_bug.cgi?id=1643841
Diffstat (limited to 'src/initrd')
| -rw-r--r-- | src/initrd/nmi-cmdline-reader.c | 4 | ||||
| -rw-r--r-- | src/initrd/nmi-ibft-reader.c | 2 | ||||
| -rw-r--r-- | src/initrd/tests/test-ibft-reader.c | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/initrd/nmi-cmdline-reader.c b/src/initrd/nmi-cmdline-reader.c index 65a2530149..d8b32f8623 100644 --- a/src/initrd/nmi-cmdline-reader.c +++ b/src/initrd/nmi-cmdline-reader.c @@ -332,7 +332,7 @@ parse_ip (GHashTable *connections, const char *sysfs_dir, char *argument) if (g_strcmp0 (kind, "none") == 0 || (g_strcmp0 (kind, "off") == 0)) { 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_IGNORE, + NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP6_CONFIG_METHOD_DISABLED, NULL); } if (nm_setting_ip_config_get_num_addresses (s_ip4) == 0) { @@ -347,7 +347,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_IGNORE, + NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP6_CONFIG_METHOD_DISABLED, NULL); } } else if (g_strcmp0 (kind, "dhcp6") == 0) { diff --git a/src/initrd/nmi-ibft-reader.c b/src/initrd/nmi-ibft-reader.c index efac53076c..2db38e2c74 100644 --- a/src/initrd/nmi-ibft-reader.c +++ b/src/initrd/nmi-ibft-reader.c @@ -182,7 +182,7 @@ ip_setting_add_from_block (GHashTable *nic, case AF_INET: s_ip = s_ip4; g_object_set (s_ip6, NM_SETTING_IP_CONFIG_METHOD, - NM_SETTING_IP6_CONFIG_METHOD_IGNORE, NULL); + NM_SETTING_IP6_CONFIG_METHOD_DISABLED, NULL); break; case AF_INET6: s_ip = s_ip6; diff --git a/src/initrd/tests/test-ibft-reader.c b/src/initrd/tests/test-ibft-reader.c index 64362d183e..a49d0abf5d 100644 --- a/src/initrd/tests/test-ibft-reader.c +++ b/src/initrd/tests/test-ibft-reader.c @@ -96,7 +96,7 @@ test_read_ibft_dhcp (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_IGNORE); + g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip6), ==, NM_SETTING_IP6_CONFIG_METHOD_DISABLED); g_object_unref (connection); } @@ -152,7 +152,7 @@ test_read_ibft_static (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_IGNORE); + g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip6), ==, NM_SETTING_IP6_CONFIG_METHOD_DISABLED); g_object_unref (connection); } @@ -263,7 +263,7 @@ test_read_ibft (void) s_ip6 = nm_connection_get_setting_ip6_config (connection); g_assert (nm_setting_ip_config_get_num_addresses (s_ip6) == 0); - g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip6), ==, NM_SETTING_IP6_CONFIG_METHOD_IGNORE); + g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip6), ==, NM_SETTING_IP6_CONFIG_METHOD_DISABLED); g_object_unref (connection); } |