aboutsummaryrefslogtreecommitdiffstats
path: root/package/network
diff options
context:
space:
mode:
authorSteven Barth <cyrus@openwrt.org>2015-04-30 12:43:46 +0000
committerSteven Barth <cyrus@openwrt.org>2015-04-30 12:43:46 +0000
commit58f7d9676be9427ecf7321dcb6cccad7002b9faf (patch)
treeee5b4827e9b3c9c54a63fd3a070579028e7dc332 /package/network
parent8084b056e24d8b988408a3ecb557cd4337e5d750 (diff)
downloadupstream-58f7d9676be9427ecf7321dcb6cccad7002b9faf.tar.gz
upstream-58f7d9676be9427ecf7321dcb6cccad7002b9faf.tar.bz2
upstream-58f7d9676be9427ecf7321dcb6cccad7002b9faf.zip
map: shorten autogenerated sub-interface names to account for limits
Signed-off-by: Steven Barth <steven@midlink.org> SVN-Revision: 45590
Diffstat (limited to 'package/network')
-rw-r--r--package/network/ipv6/map/Makefile2
-rwxr-xr-xpackage/network/ipv6/map/files/map.sh4
2 files changed, 3 insertions, 3 deletions
diff --git a/package/network/ipv6/map/Makefile b/package/network/ipv6/map/Makefile
index ed358defac..2a029f8fe8 100644
--- a/package/network/ipv6/map/Makefile
+++ b/package/network/ipv6/map/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=map
PKG_VERSION:=3
-PKG_RELEASE:=2
+PKG_RELEASE:=3
PKG_LICENSE:=GPL-2.0
include $(INCLUDE_DIR)/package.mk
diff --git a/package/network/ipv6/map/files/map.sh b/package/network/ipv6/map/files/map.sh
index 10789f07ca..5e37aa25b3 100755
--- a/package/network/ipv6/map/files/map.sh
+++ b/package/network/ipv6/map/files/map.sh
@@ -176,7 +176,7 @@ proto_map_setup() {
if [ "$type" = "lw4o6" -o "$type" = "map-e" ]; then
json_init
- json_add_string name "${cfg}_local"
+ json_add_string name "${cfg}_"
json_add_string ifname "@$(eval "echo \$RULE_${k}_PD6IFACE")"
json_add_string proto "static"
json_add_array ip6addr
@@ -189,7 +189,7 @@ proto_map_setup() {
proto_map_teardown() {
local cfg="$1"
- ifdown "${cfg}_local"
+ ifdown "${cfg}_"
rm -f /tmp/map-$cfg.rules
}