aboutsummaryrefslogtreecommitdiff
path: root/net/netifyd/files
diff options
context:
space:
mode:
authorDarryl Sokoloski <darryl@sokoloski.ca>2021-05-25 13:41:13 -0400
committerDarryl Sokoloski <darryl@sokoloski.ca>2021-05-25 13:41:13 -0400
commit047306c0e75b70073adc486a3ccf39fc9bd43428 (patch)
treecd2f749eca1a058dc4b760e7c403f922e52af0d8 /net/netifyd/files
parentf2b7dce0a46ed523830d84ede08f6c575545befe (diff)
netifyd: Fixed broken auto-configuration options passing.
Signed-off-by: Darryl Sokoloski <darryl@sokoloski.ca>
Diffstat (limited to 'net/netifyd/files')
-rw-r--r--net/netifyd/files/netifyd.init49
1 files changed, 25 insertions, 24 deletions
diff --git a/net/netifyd/files/netifyd.init b/net/netifyd/files/netifyd.init
index 4d629f7a2..3bc028235 100644
--- a/net/netifyd/files/netifyd.init
+++ b/net/netifyd/files/netifyd.init
@@ -19,30 +19,30 @@ function append_ifopts() {
local filter_expr=
for a in $1; do
- case $a in
- -F|--device-filter)
- filter=1
- procd_append_param command $a
- ;;
- -*)
- if [ $filter -gt 0 ]; then
- procd_append_param command "${filter_expr#\ }"
- filter=0; filter_expr=
- fi
- procd_append_param command $a
- ;;
- *)
- if [ $filter -gt 0 ]; then
- a=${a#\"}; a=${a%\"}; a=${a#\'}; a=${a%\'}
- filter_expr="$filter_expr $a"
- else
- procd_append_param command $a
- fi
- esac
+ case $a in
+ -F|--device-filter)
+ filter=1
+ procd_append_param command $a
+ ;;
+ -*)
+ if [ $filter -gt 0 ]; then
+ procd_append_param command "${filter_expr#\ }"
+ filter=0; filter_expr=
+ fi
+ procd_append_param command $a
+ ;;
+ *)
+ if [ $filter -gt 0 ]; then
+ a=${a#\"}; a=${a%\"}; a=${a#\'}; a=${a%\'}
+ filter_expr="$filter_expr $a"
+ else
+ procd_append_param command $a
+ fi
+ esac
done
if [ $filter -gt 0 ]; then
- procd_append_param command "${filter_expr#\ }"
+ procd_append_param command "${filter_expr#\ }"
fi
}
@@ -55,7 +55,7 @@ function append_external_if() {
}
start_netifyd() {
- local autoconfig enabled instance
+ local autoconfig enabled instance options
instance="$1"
config_get_bool enabled "$instance" enabled 0
@@ -75,8 +75,9 @@ start_netifyd() {
config_get_bool autoconfig "$instance" autoconfig 1
if [ "$autoconfig" -gt 0 ]; then
- NETIFYD_AUTODETECT=yes
- procd_append_param command "$(auto_detect_options)"
+ NETIFYD_AUTODETECT=yes
+ options="$(auto_detect_options)"
+ [ ! -z "$options" ] && procd_append_param command $options
fi
config_list_foreach "$instance" internal_if append_internal_if