openwrt-mirror/packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2025-12-21 23:34:31 +04:00
Code Issues Packages Projects Releases Wiki Activity

netifyd: Fixed broken auto-configuration options passing.

Browse Source 
Signed-off-by: Darryl Sokoloski <darryl@sokoloski.ca>
This commit is contained in:
Darryl Sokoloski
2021-05-25 13:41:13 -04:00
parent f2b7dce0a4
commit 047306c0e7
2 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/netifyd/Makefile
View File

@@ -6,7 +6,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=netifyd PKG_NAME:=netifyd
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_MAINTAINER:=Darryl Sokoloski <darryl@egloo.ca> PKG_MAINTAINER:=Darryl Sokoloski <darryl@egloo.ca>
PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE:=GPL-3.0-or-later

49
net/netifyd/files/netifyd.init
View File

@@ -19,30 +19,30 @@ function append_ifopts() {
local filter_expr= local filter_expr=
for a in $1; do for a in $1; do
case $a in case $a in
-F|--device-filter) -F|--device-filter)
filter=1 filter=1
procd_append_param command $a procd_append_param command $a
;; ;;
-*) -*)
if [ $filter -gt 0 ]; then if [ $filter -gt 0 ]; then
procd_append_param command "${filter_expr#\ }" procd_append_param command "${filter_expr#\ }"
filter=0; filter_expr= filter=0; filter_expr=
fi fi
procd_append_param command $a procd_append_param command $a
;; ;;
*) *)
if [ $filter -gt 0 ]; then if [ $filter -gt 0 ]; then
a=${a#\"}; a=${a%\"}; a=${a#\'}; a=${a%\'} a=${a#\"}; a=${a%\"}; a=${a#\'}; a=${a%\'}
filter_expr="$filter_expr $a" filter_expr="$filter_expr $a"
else else
procd_append_param command $a procd_append_param command $a
fi fi
esac esac
done done
if [ $filter -gt 0 ]; then if [ $filter -gt 0 ]; then
procd_append_param command "${filter_expr#\ }" procd_append_param command "${filter_expr#\ }"
fi fi
} }
@@ -55,7 +55,7 @@ function append_external_if() {
} }
start_netifyd() { start_netifyd() {
local autoconfig enabled instance local autoconfig enabled instance options
instance="$1" instance="$1"
config_get_bool enabled "$instance" enabled 0 config_get_bool enabled "$instance" enabled 0
@@ -75,8 +75,9 @@ start_netifyd() {
config_get_bool autoconfig "$instance" autoconfig 1 config_get_bool autoconfig "$instance" autoconfig 1
if [ "$autoconfig" -gt 0 ]; then if [ "$autoconfig" -gt 0 ]; then
NETIFYD_AUTODETECT=yes NETIFYD_AUTODETECT=yes
procd_append_param command "$(auto_detect_options)" options="$(auto_detect_options)"
[ ! -z "$options" ] && procd_append_param command $options
fi fi
config_list_foreach "$instance" internal_if append_internal_if config_list_foreach "$instance" internal_if append_internal_if