Initial changes without testing

Signed-off-by: jamesfeatherston <jamesfeatherston@utexas.edu>

diff --git a/config/init/common/lxc-net.in b/config/init/common/lxc-net.in
index 516f1d83e147da73fe525b008852c1ad5d870235..45f1dd1b631dd7ef20c9f933c3d4aeebe57c8119 100755 (executable)
--- a/config/init/common/lxc-net.in
+++ b/config/init/common/lxc-net.in
@@ -63,6 +63,10 @@ _ifup() {
 
 start_ipv6() {
     LXC_IPV6_ARG=""
+    [ -e /proc/sys/net/ipv6 ] || return 0
+    [ -f /proc/sys/net/ipv6/conf/${LXC_BRIDGE}/disable_ipv6 ] &&
+        [ "$(cat /proc/sys/net/ipv6/conf/${LXC_BRIDGE}/disable_ipv6)" -eq 1 ] &&
+            return 0
     [ "${LXC_IPV6_ENABLE}" = "true" ] || return 0
 
     if [ -n "$LXC_IPV6_ADDR" ] && [ -n "$LXC_IPV6_MASK" ] && [ -n "$LXC_IPV6_NETWORK" ]; then