From: Jo-Philipp Wich <jow@openwrt.org>
Date: Thu, 9 Jun 2011 12:26:44 +0000 (+0000)
Subject: [backfire] merge r27145
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=bb327ce0a550d4e0e0da139de74aca8932751dd3;p=openwrt%2Fsvn-archive%2Farchive.git

[backfire] merge r27145

SVN-Revision: 27146
---

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 9a1ef17229..88ae4ec3f8 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=43.19
+PKG_RELEASE:=43.20
 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 PKG_BUILD_DEPENDS:=opkg/host
diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh
index cb3cec5150..0764b658dd 100755
--- a/package/base-files/files/lib/network/config.sh
+++ b/package/base-files/files/lib/network/config.sh
@@ -235,6 +235,11 @@ setup_interface_static() {
 	config_get bcast "$config" broadcast
 	config_get metric "$config" metric
 
+	case "$ip6addr" in
+		*/*) ;;
+		*:*) ip6addr="$ip6addr/128" ;;
+	esac
+
 	[ -z "$ipaddr" ] || $DEBUG ifconfig "$iface" "$ipaddr" netmask "$netmask" broadcast "${bcast:-+}"
 	[ -z "$ip6addr" ] || $DEBUG ifconfig "$iface" add "$ip6addr"
 	[ -z "$gateway" ] || $DEBUG route add default gw "$gateway" ${metric:+metric $metric} dev "$iface"