cloud-init/SOURCES/0004-sysconfig-Don-t-write-...

37 lines
1.1 KiB
Diff
Raw Normal View History

2021-05-18 06:46:09 +00:00
From bb87d9a83ddbc5bf84fbdab9c58dedc0c9629eea Mon Sep 17 00:00:00 2001
From: Eduardo Otubo <otubo@redhat.com>
Date: Mon, 5 Oct 2020 13:51:34 +0200
2021-04-06 13:33:04 +00:00
Subject: sysconfig: Don't write BOOTPROTO=dhcp for ipv6 dhcp
Don't write BOOTPROTO=dhcp for ipv6 dhcp, as BOOTPROTO applies
only to ipv4. Explicitly write IPV6_AUTOCONF=no for dhcp on ipv6.
X-downstream-only: yes
Resolves: rhbz#1519271
Signed-off-by: Ryan McCabe <rmccabe@redhat.com>
Merged patches (19.4):
- 6444df4 sysconfig: Don't disable IPV6_AUTOCONF
2021-05-18 06:46:09 +00:00
Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-04-06 13:33:04 +00:00
---
tests/unittests/test_net.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
2021-05-18 06:46:09 +00:00
index 9985a97..2cc57fe 100644
2021-04-06 13:33:04 +00:00
--- a/tests/unittests/test_net.py
+++ b/tests/unittests/test_net.py
2021-05-18 06:46:09 +00:00
@@ -1614,6 +1614,7 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
2021-04-06 13:33:04 +00:00
BOOTPROTO=none
DEVICE=bond0
DHCPV6C=yes
+ IPV6_AUTOCONF=no
IPV6INIT=yes
MACADDR=aa:bb:cc:dd:ee:ff
ONBOOT=yes
--
1.8.3.1