Bladeren bron

Merge pull request #1603 from Adze1502/master

mwan3: update to version 1.6-2
Steven Barth 9 jaren geleden
bovenliggende
commit
2eeb4e9c19
2 gewijzigde bestanden met toevoegingen van 5 en 5 verwijderingen
  1. 1
    1
      net/mwan3/Makefile
  2. 4
    4
      net/mwan3/files/usr/sbin/mwan3

+ 1
- 1
net/mwan3/Makefile Bestand weergeven

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
9 9
 
10 10
 PKG_NAME:=mwan3
11 11
 PKG_VERSION:=1.6
12
-PKG_RELEASE:=1
12
+PKG_RELEASE:=2
13 13
 PKG_MAINTAINER:=Jeroen Louwes <jeroen.louwes@gmail.com>
14 14
 PKG_LICENSE:=GPLv2
15 15
 

+ 4
- 4
net/mwan3/files/usr/sbin/mwan3 Bestand weergeven

@@ -58,7 +58,7 @@ ifup()
58 58
 
59 59
 	config_get enabled "$1" enabled 0
60 60
 
61
-	device=$(uci get -p /var/state network.$1.ifname) &> /dev/null
61
+	device=$(uci -p /var/state get network.$1.ifname) &> /dev/null
62 62
 
63 63
 	if [ -n "$device" ] ; then
64 64
 		[ "$enabled" -eq 1 ] && ACTION=ifup INTERFACE=$1 DEVICE=$device /sbin/hotplug-call iface
@@ -76,7 +76,7 @@ interfaces()
76 76
 	check_iface_status()
77 77
 	{
78 78
 		let iface_id++
79
-		device=$(uci get -p /var/state network.$1.ifname) &> /dev/null
79
+		device=$(uci -p /var/state get network.$1.ifname) &> /dev/null
80 80
 
81 81
 		if [ -z "$device" ]; then
82 82
 			echo " interface $1 is unknown"
@@ -92,7 +92,7 @@ interfaces()
92 92
 		fi
93 93
 
94 94
 		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
95
-			if [ -n "$(uci get -p /var/state mwan3.$1.track_ip 2> /dev/null)" ]; then
95
+			if [ -n "$(uci -p /var/state get mwan3.$1.track_ip 2> /dev/null)" ]; then
96 96
 				echo " interface $1 is online (tracking $tracking)"
97 97
 			else
98 98
 				echo " interface $1 is online"
@@ -101,7 +101,7 @@ interfaces()
101 101
 			echo " interface $1 error"
102 102
 		else
103 103
 			if [ "$enabled" -eq 1 ]; then
104
-				if [ -n "$(uci get -p /var/state mwan3.$1.track_ip 2> /dev/null)" ]; then
104
+				if [ -n "$(uci -p /var/state get mwan3.$1.track_ip 2> /dev/null)" ]; then
105 105
 					echo " interface $1 is offline (tracking $tracking)"
106 106
 				else
107 107
 					echo " interface $1 is offline"