From c7ef810f5f8b91f3d49989657ed43de78d7bba7e Mon Sep 17 00:00:00 2001 From: Jeroen Louwes Date: Tue, 21 Jul 2015 15:04:01 +0200 Subject: [PATCH] mwan3: update to version 1.6-2 Fix malformed uci commands. (issue #1502) Signed-off-by: Jeroen Louwes --- net/mwan3/Makefile | 2 +- net/mwan3/files/usr/sbin/mwan3 | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/net/mwan3/Makefile b/net/mwan3/Makefile index d714d4fe9..97511b998 100644 --- a/net/mwan3/Makefile +++ b/net/mwan3/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mwan3 PKG_VERSION:=1.6 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:=Jeroen Louwes PKG_LICENSE:=GPLv2 diff --git a/net/mwan3/files/usr/sbin/mwan3 b/net/mwan3/files/usr/sbin/mwan3 index c69d94eeb..b887fa5e6 100755 --- a/net/mwan3/files/usr/sbin/mwan3 +++ b/net/mwan3/files/usr/sbin/mwan3 @@ -58,7 +58,7 @@ ifup() config_get enabled "$1" enabled 0 - device=$(uci get -p /var/state network.$1.ifname) &> /dev/null + device=$(uci -p /var/state get network.$1.ifname) &> /dev/null if [ -n "$device" ] ; then [ "$enabled" -eq 1 ] && ACTION=ifup INTERFACE=$1 DEVICE=$device /sbin/hotplug-call iface @@ -76,7 +76,7 @@ interfaces() check_iface_status() { let iface_id++ - device=$(uci get -p /var/state network.$1.ifname) &> /dev/null + device=$(uci -p /var/state get network.$1.ifname) &> /dev/null if [ -z "$device" ]; then echo " interface $1 is unknown" @@ -92,7 +92,7 @@ interfaces() fi if [ -n "$($IP rule | awk '$5 == "'$device'"')" -a -n "$($IPT -S mwan3_iface_$1 2> /dev/null)" -a -n "$($IP route list table $iface_id default dev $device 2> /dev/null)" ]; then - if [ -n "$(uci get -p /var/state mwan3.$1.track_ip 2> /dev/null)" ]; then + if [ -n "$(uci -p /var/state get mwan3.$1.track_ip 2> /dev/null)" ]; then echo " interface $1 is online (tracking $tracking)" else echo " interface $1 is online" @@ -101,7 +101,7 @@ interfaces() echo " interface $1 error" else if [ "$enabled" -eq 1 ]; then - if [ -n "$(uci get -p /var/state mwan3.$1.track_ip 2> /dev/null)" ]; then + if [ -n "$(uci -p /var/state get mwan3.$1.track_ip 2> /dev/null)" ]; then echo " interface $1 is offline (tracking $tracking)" else echo " interface $1 is offline"