From c181485ae596f49d9dfd8b78f4184ab7fcad6a8a Mon Sep 17 00:00:00 2001 From: Sheng Yang Date: Fri, 13 Jun 2014 11:05:35 -0700 Subject: [PATCH] CLOUDSTACK-6908: Enable IPv6 in sysctl when only necessary This new way would only enable IPv6 when VR is created in IPv6 shared network. Otherwise IPv6 sysctl options remain disable. --- .../patches/debian/config/etc/init.d/cloud-early-config | 1 + systemvm/patches/debian/config/etc/sysctl.conf | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/systemvm/patches/debian/config/etc/init.d/cloud-early-config b/systemvm/patches/debian/config/etc/init.d/cloud-early-config index b8c40db4d71..938e6f863ea 100755 --- a/systemvm/patches/debian/config/etc/init.d/cloud-early-config +++ b/systemvm/patches/debian/config/etc/init.d/cloud-early-config @@ -387,6 +387,7 @@ setup_interface() { setup_interface_ipv6() { sysctl net.ipv6.conf.all.disable_ipv6=0 + sysctl net.ipv6.conf.all.forwarding=1 sysctl net.ipv6.conf.all.accept_ra=1 local intfnum=$1 diff --git a/systemvm/patches/debian/config/etc/sysctl.conf b/systemvm/patches/debian/config/etc/sysctl.conf index 586d5bdb7c6..961d471dfa9 100644 --- a/systemvm/patches/debian/config/etc/sysctl.conf +++ b/systemvm/patches/debian/config/etc/sysctl.conf @@ -42,8 +42,8 @@ net.ipv4.tcp_max_tw_buckets=1000000 net.core.somaxconn=1000000 # Disable IPv6 -net.ipv6.conf.all.disable_ipv6 = 0 -net.ipv6.conf.all.forwarding = 1 -net.ipv6.conf.all.accept_ra = 1 +net.ipv6.conf.all.disable_ipv6 = 1 +net.ipv6.conf.all.forwarding = 0 +net.ipv6.conf.all.accept_ra = 0 net.ipv6.conf.all.accept_redirects = 0 net.ipv6.conf.all.autoconf = 0