From: Jo-Philipp Wich <jow@openwrt.org>
Date: Thu, 9 Jun 2011 12:25:48 +0000 (+0000)
Subject: base-files: if an ip6addr without a prefix is given, assume /128 - otherwise the... 
X-Git-Tag: reboot~16591
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=fd8ec241877a19ea3ee8842f274e8e1d6454186d;p=openwrt%2Fstaging%2Fpepe2k.git

base-files: if an ip6addr without a prefix is given, assume /128 - otherwise the busybox utilities will interpret it as /0 and create an invalid default route

SVN-Revision: 27145
---

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 2ad6bdd516..23bd51a0bd 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:=72
+PKG_RELEASE:=73
 
 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 7e4a53d0a7..76ba324973 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"