diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/network/config/netifd/Makefile | 2 | ||||
| -rw-r--r-- | package/network/config/netifd/files/etc/hotplug.d/iface/00-netstate | 1 | ||||
| -rwxr-xr-x | package/network/config/netifd/files/lib/network/config.sh | 3 |
3 files changed, 1 insertions, 5 deletions
diff --git a/package/network/config/netifd/Makefile b/package/network/config/netifd/Makefile index 874183507f..7e739ab6bc 100644 --- a/package/network/config/netifd/Makefile +++ b/package/network/config/netifd/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=netifd -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/netifd.git diff --git a/package/network/config/netifd/files/etc/hotplug.d/iface/00-netstate b/package/network/config/netifd/files/etc/hotplug.d/iface/00-netstate index 023025cd1a..71ccb01915 100644 --- a/package/network/config/netifd/files/etc/hotplug.d/iface/00-netstate +++ b/package/network/config/netifd/files/etc/hotplug.d/iface/00-netstate @@ -1,7 +1,6 @@ [ ifup = "$ACTION" ] && { uci_toggle_state network "$INTERFACE" up 1 [ -n "$DEVICE" ] && { - uci_toggle_state network "$INTERFACE" device "$(uci -q get network.$INTERFACE.ifname)" uci_toggle_state network "$INTERFACE" ifname "$DEVICE" } } diff --git a/package/network/config/netifd/files/lib/network/config.sh b/package/network/config/netifd/files/lib/network/config.sh index 9128971dab..0ded45edc4 100755 --- a/package/network/config/netifd/files/lib/network/config.sh +++ b/package/network/config/netifd/files/lib/network/config.sh @@ -41,15 +41,12 @@ fixup_interface() { config_get type "$config" type config_get ifname "$config" ifname - config_get device "$config" device "$ifname" [ "bridge" = "$type" ] && ifname="br-$config" - config_set "$config" device "$ifname" ubus_call "network.interface.$config" status || return 0 json_get_var l3dev l3_device [ -n "$l3dev" ] && ifname="$l3dev" json_init config_set "$config" ifname "$ifname" - config_set "$config" device "$device" } scan_interfaces() { |