aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/config
diff options
context:
space:
mode:
authorSteven Barth <cyrus@openwrt.org>2015-04-17 13:10:19 +0000
committerSteven Barth <cyrus@openwrt.org>2015-04-17 13:10:19 +0000
commit6b062ad8485c759b94e03d2639097684096b7ab1 (patch)
treeb770b7c4449b6e3715700792380542a9e79f554e /package/network/config
parentd86d0bf7ea2e8bd6ab2658390a06156bbe1a1ffc (diff)
downloadupstream-6b062ad8485c759b94e03d2639097684096b7ab1.tar.gz
upstream-6b062ad8485c759b94e03d2639097684096b7ab1.tar.bz2
upstream-6b062ad8485c759b94e03d2639097684096b7ab1.zip
network: shorten names of generated interfaces
Signed-off-by: Steven Barth <steven@midlink.org> SVN-Revision: 45476
Diffstat (limited to 'package/network/config')
-rw-r--r--package/network/config/netifd/Makefile4
-rwxr-xr-xpackage/network/config/netifd/files/lib/netifd/dhcp.script2
2 files changed, 3 insertions, 3 deletions
diff --git a/package/network/config/netifd/Makefile b/package/network/config/netifd/Makefile
index 622bc15668..3b30d567f6 100644
--- a/package/network/config/netifd/Makefile
+++ b/package/network/config/netifd/Makefile
@@ -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:=
diff --git a/package/network/config/netifd/files/lib/netifd/dhcp.script b/package/network/config/netifd/files/lib/netifd/dhcp.script
index a3219a0701..fb9f95a517 100755
--- a/package/network/config/netifd/files/lib/netifd/dhcp.script
+++ b/package/network/config/netifd/files/lib/netifd/dhcp.script
@@ -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"