mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2024-12-25 16:13:05 +00:00
network: shorten names of generated interfaces
Signed-off-by: Steven Barth <steven@midlink.org> SVN-Revision: 45476
This commit is contained in:
parent
d86d0bf7ea
commit
6b062ad848
@ -1,13 +1,13 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=netifd
|
||||
PKG_VERSION:=2015-04-09
|
||||
PKG_VERSION:=2015-04-17
|
||||
PKG_RELEASE=$(PKG_SOURCE_VERSION)
|
||||
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_URL:=http://git.openwrt.org/project/netifd.git
|
||||
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
|
||||
PKG_SOURCE_VERSION:=92d2aea918f650f309f753349457028032d53280
|
||||
PKG_SOURCE_VERSION:=8b468ec5022834d04b6be1cf45b4fe4f092c692e
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
|
||||
PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
|
||||
# PKG_MIRROR_MD5SUM:=
|
||||
|
@ -57,7 +57,7 @@ setup_interface () {
|
||||
local ip6rdbr="${ip6rd%% *}"
|
||||
|
||||
[ -n "$ZONE" ] || ZONE=$(fw3 -q network $INTERFACE)
|
||||
[ -z "$IFACE6RD" -o "$IFACE6RD" = 1 ] && IFACE6RD=${INTERFACE}_6rd
|
||||
[ -z "$IFACE6RD" -o "$IFACE6RD" = 1 ] && IFACE6RD=${INTERFACE}_6
|
||||
|
||||
json_init
|
||||
json_add_string name "$IFACE6RD"
|
||||
|
@ -8,7 +8,7 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=ds-lite
|
||||
PKG_VERSION:=5
|
||||
PKG_VERSION:=6
|
||||
PKG_RELEASE:=1
|
||||
PKG_LICENSE:=GPL-2.0
|
||||
|
||||
|
@ -12,7 +12,7 @@
|
||||
proto_dslite_setup() {
|
||||
local cfg="$1"
|
||||
local iface="$2"
|
||||
local link="dslite-$cfg"
|
||||
local link="ds-$cfg"
|
||||
|
||||
local mtu ttl peeraddr ip6addr tunlink zone weakif
|
||||
json_get_vars mtu ttl peeraddr ip6addr tunlink zone weakif
|
||||
|
@ -8,7 +8,7 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=odhcp6c
|
||||
PKG_VERSION:=2015-04-15
|
||||
PKG_VERSION:=2015-04-17
|
||||
PKG_RELEASE=$(PKG_SOURCE_VERSION)
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
|
||||
|
@ -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"
|
||||
|
Loading…
Reference in New Issue
Block a user