EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

map: shorten autogenerated sub-interface names to account for limits

Browse Source 
Signed-off-by: Steven Barth <steven@midlink.org>

SVN-Revision: 45590
This commit is contained in:
Steven Barth 2015-04-30 12:43:46 +00:00
parent 8084b056e2
commit 58f7d9676b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/network/ipv6/map/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=map PKG_NAME:=map
PKG_VERSION:=3 PKG_VERSION:=3
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

4
package/network/ipv6/map/files/map.sh
View File

@ -176,7 +176,7 @@ proto_map_setup() {
if [ "$type" = "lw4o6" -o "$type" = "map-e" ]; then if [ "$type" = "lw4o6" -o "$type" = "map-e" ]; then
json_init 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 ifname "@$(eval "echo \$RULE_${k}_PD6IFACE")"
json_add_string proto "static" json_add_string proto "static"
json_add_array ip6addr json_add_array ip6addr
@ -189,7 +189,7 @@ proto_map_setup() {
proto_map_teardown() { proto_map_teardown() {
local cfg="$1" local cfg="$1"
ifdown "${cfg}_local" ifdown "${cfg}_"
rm -f /tmp/map-$cfg.rules rm -f /tmp/map-$cfg.rules
} }