From: jamesfeatherston <jamesfeatherston@utexas.edu>
Date: Wed, 3 Dec 2025 00:26:33 +0000 (-0600)
Subject: Initial changes without testing
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fee221caeff7e29153a7ca989a657e0e660e1653;p=thirdparty%2Flxc.git

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 516f1d83e..45f1dd1b6 100755
--- 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