From 8ff1376767245d8bae594618534e1a256e203e11 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Thu, 9 Jun 2011 12:26:44 +0000 Subject: [PATCH] merge r27145 SVN-Revision: 27146 --- package/base-files/Makefile | 2 +- package/base-files/files/lib/network/config.sh | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) 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" -- 2.30.2