diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-01-20 15:52:19 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-01-20 15:52:19 +0000 |
| commit | 1ee4c9b2910259c7321cdd16a3b2d40df3322760 (patch) | |
| tree | 4cb3ea201245c91eadfad4119ca4569ec26bbdde | |
| parent | a73e82053478187dbe51300cbba6c01642bbd07a (diff) | |
| download | upstream-1ee4c9b2910259c7321cdd16a3b2d40df3322760.tar.gz upstream-1ee4c9b2910259c7321cdd16a3b2d40df3322760.tar.bz2 upstream-1ee4c9b2910259c7321cdd16a3b2d40df3322760.zip | |
netifd: sync with trunk r35251
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@35254 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/netifd/Makefile | 10 | ||||
| -rwxr-xr-x | package/netifd/files/etc/init.d/network | 2 | ||||
| -rwxr-xr-x | package/netifd/files/lib/netifd/proto/dhcp.sh | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/package/netifd/Makefile b/package/netifd/Makefile index 4e247cd744..4fbc793a33 100644 --- a/package/netifd/Makefile +++ b/package/netifd/Makefile @@ -1,17 +1,23 @@ include $(TOPDIR)/rules.mk PKG_NAME:=netifd -PKG_VERSION:=2012-12-17.1 +PKG_VERSION:=2013-01-20 PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=git://nbd.name/luci2/netifd.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=2eca28705a27ab37ee902308af2c134c64c95e61 +PKG_SOURCE_VERSION:=ed984c7aea436999c38cc40c5ebaf98bd8294df4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz +PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org> # PKG_MIRROR_MD5SUM:= # CMAKE_INSTALL:=1 +PKG_LICENSE:=GPLv2 +PKG_LICENSE_FILES:= + +PKG_BUILD_PARALLEL:=1 + include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk diff --git a/package/netifd/files/etc/init.d/network b/package/netifd/files/etc/init.d/network index 28b1ba3dde..429f33dd92 100755 --- a/package/netifd/files/etc/init.d/network +++ b/package/netifd/files/etc/init.d/network @@ -19,7 +19,7 @@ start() { include /lib/network setup_switch - sleep 1 + sleep 5 /sbin/wifi down /sbin/wifi up diff --git a/package/netifd/files/lib/netifd/proto/dhcp.sh b/package/netifd/files/lib/netifd/proto/dhcp.sh index 7dea1cf6c2..38308785df 100755 --- a/package/netifd/files/lib/netifd/proto/dhcp.sh +++ b/package/netifd/files/lib/netifd/proto/dhcp.sh @@ -26,7 +26,7 @@ proto_dhcp_setup() { append dhcpopts "-O $opt" done - [ "$broadcast" = 1 ] && broadcast="-O broadcast" || broadcast= + [ "$broadcast" = 1 ] && broadcast="-B" || broadcast= [ -n "$clientid" ] && clientid="-x 0x3d:${clientid//:/}" || clientid="-C" proto_export "INTERFACE=$config" |