[backfire] merge r27145
authorJo-Philipp Wich <jow@openwrt.org>
Thu, 9 Jun 2011 12:26:44 +0000 (12:26 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Thu, 9 Jun 2011 12:26:44 +0000 (12:26 +0000)
SVN-Revision: 27146

package/base-files/Makefile
package/base-files/files/lib/network/config.sh

index 9a1ef17229f70e0233a0fa96aa5a341a87ab3573..88ae4ec3f8c4e61609c899a06c2c1eb9206b17e3 100644 (file)
@@ -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
index cb3cec515030786db34e179294b9f917a488c8ed..0764b658dddbc32f23d1e305a72354c050ca199b 100755 (executable)
@@ -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"