From 3f79fcb756695d5d2a7ac0d2a6e0bc3b7030677e Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Tue, 21 Mar 2017 08:31:03 +0100 Subject: [PATCH] net/mwan3: pass environment variables to mwan3-user User scripts conversion from luci-app-wan3 will be simplified if the variables are passed by env instead of arguments. Signed-off-by: Florian Eckert --- net/mwan3/files/etc/hotplug.d/iface/16-mwan3-user | 5 +++-- net/mwan3/files/etc/mwan3.user | 9 +++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/net/mwan3/files/etc/hotplug.d/iface/16-mwan3-user b/net/mwan3/files/etc/hotplug.d/iface/16-mwan3-user index d47208791..485f8de4e 100644 --- a/net/mwan3/files/etc/hotplug.d/iface/16-mwan3-user +++ b/net/mwan3/files/etc/hotplug.d/iface/16-mwan3-user @@ -4,9 +4,10 @@ . /lib/functions.sh config_load mwan3 - config_get enabled $INTERFACE enabled 0 + config_get enabled "$INTERFACE" enabled 0 [ "${enabled}" = "1" ] || exit 0 - /bin/sh /etc/mwan3.user $ACTION $INTERFACE $DEVICE + env -i ACTION="$ACTION" INTERFACE="$INTERFACE" DEVICE="$DEVICE" \ + /bin/sh /etc/mwan3.user } exit 0 diff --git a/net/mwan3/files/etc/mwan3.user b/net/mwan3/files/etc/mwan3.user index d1c5349c9..3c1f9fb7a 100644 --- a/net/mwan3/files/etc/mwan3.user +++ b/net/mwan3/files/etc/mwan3.user @@ -5,7 +5,8 @@ # be executed with each netifd hotplug interface event # on interfaces for which mwan3 is enabled. # -# Parameter values from hotplug.d -# $1 = ACTION (ifup/ifdown) -# $2 = INTERFACE (wan/lan/...) -# $3 = DEVICE (eth0/wwan0/...) +# There are three main environment variables that are passed to this script. +# +# $ACTION Either "ifup" or "ifdown" +# $INTERFACE Name of the interface which went up or down (e.g. "wan" or "wwan") +# $DEVICE Physical device name which interface went up or down (e.g. "eth0" or "wwan0")