diff options
| author | Steven Barth <steven@midlink.org> | 2015-04-30 12:43:46 +0000 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2015-04-30 12:43:46 +0000 |
| commit | c93ad2efc6fc70ba81a1887376327d0a2d60f507 (patch) | |
| tree | b2eb980f612888cdfab39a1dadb4d10c89287507 | |
| parent | 76845cc2b8b1343598c67c97d6cdfeea5a15c1c1 (diff) | |
| download | upstream-c93ad2efc6fc70ba81a1887376327d0a2d60f507.tar.gz upstream-c93ad2efc6fc70ba81a1887376327d0a2d60f507.tar.bz2 upstream-c93ad2efc6fc70ba81a1887376327d0a2d60f507.zip | |
map: shorten autogenerated sub-interface names to account for limits
Signed-off-by: Steven Barth <steven@midlink.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45590 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/network/ipv6/map/Makefile | 2 | ||||
| -rwxr-xr-x | package/network/ipv6/map/files/map.sh | 4 |
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 } |