Nanako/DHDAXCW-Rockchip-OpenWrt
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

revert netifd

Browse Source
This commit is contained in:
coolsnowwolf 2018-01-10 16:34:02 +08:00
parent 72478019bb
commit 6d210c00b6
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/network/config/netifd/Makefile
View File

@ -5,9 +5,9 @@ PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=$(LEDE_GIT)/project/netifd.git
PKG_SOURCE_DATE:=2018-01-04
PKG_SOURCE_VERSION:=fd5c399c01ceb1bbede3ae8b0e1daaa7652a6fa1
PKG_MIRROR_HASH:=0040f94d11d0039505328a90b2ff48968db873e9e7967307631bf40ef5679275
PKG_SOURCE_DATE:=2017-01-25
PKG_SOURCE_VERSION:=650758b16e5185505a3fbc1307949340af70b611
PKG_MIRROR_HASH:=d09c740bc1bf6269678bd75c9af52ecd4be3d1d59402a543ceb9d4459cecfa2b
PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
PKG_LICENSE:=GPL-2.0

10
package/network/config/netifd/files/lib/netifd/dhcp.script
View File

@ -18,12 +18,10 @@ setup_interface () {
proto_add_ipv4_address "$ip" "${subnet:-255.255.255.0}"
# TODO: apply $broadcast
local i
for i in $router; do
proto_add_ipv4_route "$i" 32 "" "$ip"
proto_add_ipv4_route 0.0.0.0 0 "$i" "$ip"
local r
for r in $CUSTOMROUTES; do
proto_add_ipv4_route "${r%%/*}" "${r##*/}" "$i" "$ip"
done
@ -33,11 +31,11 @@ setup_interface () {
[ -n "$staticroutes" ] && set_classless_routes $staticroutes
[ -n "$msstaticroutes" ] && set_classless_routes $msstaticroutes
for i in $dns; do
proto_add_dns_server "$i"
for dns in $dns; do
proto_add_dns_server "$dns"
done
for i in $domain; do
proto_add_dns_search "$i"
for domain in $domain; do
proto_add_dns_search "$domain"
done
proto_add_data

1
package/network/config/netifd/files/lib/netifd/proto/dhcp.sh
View File

@ -40,7 +40,6 @@ proto_dhcp_setup() {
append dhcpopts "-x $opt"
done
[ -z "$hostname" ] && hostname="$(cat /proc/sys/kernel/hostname)"
[ "$broadcast" = 1 ] && broadcast="-B" || broadcast=
[ "$release" = 1 ] && release="-R" || release=
[ -n "$clientid" ] && clientid="-x 0x3d:${clientid//:/}" || clientid="-C"