From 439f5f82a86db89c7b6eab5d98fe48f75d70d475 Mon Sep 17 00:00:00 2001
From: Christoph Vigano <mail@cvigano.de>
Date: Wed, 22 Feb 2012 15:37:54 +0100
Subject: Fix IPv6 SLAAC address/route bug

Fixes FS#26370.
---
 src/connections/ethernet | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/connections')

diff --git a/src/connections/ethernet b/src/connections/ethernet
index 04d65fa..78f8240 100644
--- a/src/connections/ethernet
+++ b/src/connections/ethernet
@@ -22,6 +22,11 @@ ethernet_up() {
         fi
     fi
 
+    # Disable IPv6 before the interface to prevent SLAAC
+    if [[ "$IP6" == "no"]]; then
+        sysctl -q -w net.ipv6.conf.$INTERFACE.disable_ipv6=1
+    fi
+
     report_debug ethernet_iproute_up ifup
     bring_interface up "$INTERFACE"
 
@@ -137,7 +142,7 @@ ethernet_up() {
     dhcp*|stateless|static)
         [ -d "/proc/sys/net/ipv6" ] || modprobe ipv6
         ;;
-    ""|no)
+    no)
         [ -d /proc/sys/net/ipv6 ] && sysctl -q -w net.ipv6.conf.$INTERFACE.accept_ra=0
         ;;
     *)
-- 
cgit v1.2.3-24-g4f1b