forked from rpms/cloud-init
37 lines
1.1 KiB
Diff
37 lines
1.1 KiB
Diff
From bb87d9a83ddbc5bf84fbdab9c58dedc0c9629eea Mon Sep 17 00:00:00 2001
|
|
From: Eduardo Otubo <otubo@redhat.com>
|
|
Date: Mon, 5 Oct 2020 13:51:34 +0200
|
|
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
|
|
|
|
Signed-off-by: Eduardo Otubo <otubo@redhat.com>
|
|
---
|
|
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
|
|
index 9985a97..2cc57fe 100644
|
|
--- a/tests/unittests/test_net.py
|
|
+++ b/tests/unittests/test_net.py
|
|
@@ -1614,6 +1614,7 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
|
|
BOOTPROTO=none
|
|
DEVICE=bond0
|
|
DHCPV6C=yes
|
|
+ IPV6_AUTOCONF=no
|
|
IPV6INIT=yes
|
|
MACADDR=aa:bb:cc:dd:ee:ff
|
|
ONBOOT=yes
|
|
--
|
|
1.8.3.1
|
|
|