base-files: remove IPv6 LL addr from interfaces before adding them to a bridge

SVN-Revision: 21659

diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh
index 2ca04faeb909b03278cd4da76697504afd77e232..1736f8e7cc74dda292d0c423b28b82ce2e9ba12f 100755 (executable)
--- a/package/base-files/files/lib/network/config.sh
+++ b/package/base-files/files/lib/network/config.sh
@@ -164,6 +164,15 @@ prepare_interface() {
                        local macaddr
                        config_get macaddr "$config" macaddr
                        [ -x /usr/sbin/brctl ] && {
+                               # Remove IPv6 link local addr before adding the iface to the bridge
+                               local llv6="$(ifconfig "$iface")"
+                               case "$llv6" in
+                                       *fe80:*/64*)
+                                               llv6="${llv6#* fe80:}"
+                                               ifconfig "$iface" del "fe80:${llv6%% *}"
+                                       ;;
+                               esac
+
                                ifconfig "br-$config" 2>/dev/null >/dev/null && {
                                        local newdevs devices
                                        config_get devices "$config" device