fix #2027: do not disable IPV6_AUTOCONF on centos

we used to disable IPV6_AUTOCONF when the DHCP option was chosen for the
container network (was only activated with SLAAC option).

however, this option is actually dependent on IPV6FORWARDING (which is
set to no by default), according to this rule:

IPV6_AUTOCONF=!IPV6FORWARDING

which enables it automatically when forwarding is disabled. this way, we
respect the defaults set by centos.

Signed-off-by: Oguz Bektas <o.bektas@proxmox.com>

diff --git a/src/PVE/LXC/Setup/CentOS.pm b/src/PVE/LXC/Setup/CentOS.pm
index 2b7f90c21e792ca420612ab547d74d6445396e6d..84bde5cb990cbbafd84b5be5750f56113d07e476 100644 (file)
--- a/src/PVE/LXC/Setup/CentOS.pm
+++ b/src/PVE/LXC/Setup/CentOS.pm
@@ -206,8 +206,6 @@ sub setup_network {
            $data .= "IPV6INIT=yes\n";
            if ($d->{ip6} eq 'auto') {
                $data .= "IPV6_AUTOCONF=yes\n";
-           } else {
-               $data .= "IPV6_AUTOCONF=no\n";
            }
            if ($d->{ip6} eq 'dhcp') {
                $data .= "DHCPV6C=yes\n";

diff --git a/src/test/test-centos6-002/etc/sysconfig/network-scripts/ifcfg-eth0.exp b/src/test/test-centos6-002/etc/sysconfig/network-scripts/ifcfg-eth0.exp
index a6cc799a0c6ee3e66a47ab2842efee9f21d67c9c..6f04e037b560065a617a5a89ea8604f273a75984 100644 (file)
--- a/src/test/test-centos6-002/etc/sysconfig/network-scripts/ifcfg-eth0.exp
+++ b/src/test/test-centos6-002/etc/sysconfig/network-scripts/ifcfg-eth0.exp
@@ -5,5 +5,4 @@ IPADDR=1.2.3.4
 NETMASK=255.255.255.0
 GATEWAY=4.3.2.1
 IPV6INIT=yes
-IPV6_AUTOCONF=no
 IPV6ADDR=2000::1/64

diff --git a/src/test/test-centos6-002/etc/sysconfig/network-scripts/ifcfg-eth1.exp b/src/test/test-centos6-002/etc/sysconfig/network-scripts/ifcfg-eth1.exp
index 6b92947ef2fb72318fb965f244cd1bc3346c8dc1..a97b78b1028d1306e750eb5e1b90bdb1880b57bb 100644 (file)
--- a/src/test/test-centos6-002/etc/sysconfig/network-scripts/ifcfg-eth1.exp
+++ b/src/test/test-centos6-002/etc/sysconfig/network-scripts/ifcfg-eth1.exp
@@ -2,6 +2,5 @@ DEVICE=eth1
 ONBOOT=yes
 BOOTPROTO=none
 IPV6INIT=yes
-IPV6_AUTOCONF=no
 IPV6ADDR=2222::1/64
 IPV6_DEFAULTGW=fe80::1