diff options
author | Steven Barth <steven@midlink.org> | 2015-04-17 13:10:19 +0000 |
---|---|---|
committer | Steven Barth <steven@midlink.org> | 2015-04-17 13:10:19 +0000 |
commit | 489484be5de20b04c24dd6610811dbfb2db8bc87 (patch) | |
tree | aa2c49693419c0706cdf2827150d92e41cdf67eb /package/network/ipv6/odhcp6c/files | |
parent | 32db95127493e488924dcf04eadf2e6e6e1d72c7 (diff) | |
download | upstream-489484be5de20b04c24dd6610811dbfb2db8bc87.tar.gz upstream-489484be5de20b04c24dd6610811dbfb2db8bc87.tar.bz2 upstream-489484be5de20b04c24dd6610811dbfb2db8bc87.zip |
network: shorten names of generated interfaces
Signed-off-by: Steven Barth <steven@midlink.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45476 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/network/ipv6/odhcp6c/files')
-rwxr-xr-x | package/network/ipv6/odhcp6c/files/dhcpv6.script | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/package/network/ipv6/odhcp6c/files/dhcpv6.script b/package/network/ipv6/odhcp6c/files/dhcpv6.script index 515bee32b4..5f3ff1546e 100755 --- a/package/network/ipv6/odhcp6c/files/dhcpv6.script +++ b/package/network/ipv6/odhcp6c/files/dhcpv6.script @@ -122,7 +122,7 @@ setup_interface () { [ -n "$ZONE" ] || ZONE=$(fw3 -q network $INTERFACE) if [ "$IFACE_MAP" != 0 -a -n "$MAPTYPE" -a -n "$MAPRULE" ]; then - [ -z "$IFACE_MAP" -o "$IFACE_MAP" = 1 ] && IFACE_MAP=${INTERFACE}_map + [ -z "$IFACE_MAP" -o "$IFACE_MAP" = 1 ] && IFACE_MAP=${INTERFACE}_4 json_init json_add_string name "$IFACE_MAP" json_add_string ifname "@$INTERFACE" @@ -136,7 +136,7 @@ setup_interface () { json_close_object ubus call network add_dynamic "$(json_dump)" elif [ -n "$AFTR" -a "$IFACE_DSLITE" != 0 -a -f /lib/netifd/proto/dslite.sh ]; then - [ -z "$IFACE_DSLITE" -o "$IFACE_DSLITE" = 1 ] && IFACE_DSLITE=${INTERFACE}_dslite + [ -z "$IFACE_DSLITE" -o "$IFACE_DSLITE" = 1 ] && IFACE_DSLITE=${INTERFACE}_4 json_init json_add_string name "$IFACE_DSLITE" json_add_string ifname "@$INTERFACE" @@ -149,7 +149,7 @@ setup_interface () { json_close_object ubus call network add_dynamic "$(json_dump)" elif [ "$IFACE_464XLAT" != 0 -a -f /lib/netifd/proto/464xlat.sh ]; then - [ -z "$IFACE_464XLAT" -o "$IFACE_464XLAT" = 1 ] && IFACE_464XLAT=${INTERFACE}_464xlat + [ -z "$IFACE_464XLAT" -o "$IFACE_464XLAT" = 1 ] && IFACE_464XLAT=${INTERFACE}_4 json_init json_add_string name "$IFACE_464XLAT" json_add_string ifname "@$INTERFACE" |