diff options
| author | Steven Barth <cyrus@openwrt.org> | 2015-04-17 13:10:19 +0000 |
|---|---|---|
| committer | Steven Barth <cyrus@openwrt.org> | 2015-04-17 13:10:19 +0000 |
| commit | 6b062ad8485c759b94e03d2639097684096b7ab1 (patch) | |
| tree | b770b7c4449b6e3715700792380542a9e79f554e /package/network/ipv6/odhcp6c/files | |
| parent | d86d0bf7ea2e8bd6ab2658390a06156bbe1a1ffc (diff) | |
| download | master-31e0f0ae-6b062ad8485c759b94e03d2639097684096b7ab1.tar.gz master-31e0f0ae-6b062ad8485c759b94e03d2639097684096b7ab1.tar.bz2 master-31e0f0ae-6b062ad8485c759b94e03d2639097684096b7ab1.zip | |
network: shorten names of generated interfaces
Signed-off-by: Steven Barth <steven@midlink.org>
SVN-Revision: 45476
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" |