From 2aeb05fae4650db898bf5bbd6ef68fd082a44b97 Mon Sep 17 00:00:00 2001
From: Ycarus <ycarus@zugaina.org>
Date: Wed, 5 Dec 2018 13:02:38 +0100
Subject: [PATCH] Fix vnstat config

---
 .../files/etc/uci-defaults/1970-omr-vnstat    | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/openmptcprouter/files/etc/uci-defaults/1970-omr-vnstat b/openmptcprouter/files/etc/uci-defaults/1970-omr-vnstat
index 334c4c9d4..cbfcbb134 100755
--- a/openmptcprouter/files/etc/uci-defaults/1970-omr-vnstat
+++ b/openmptcprouter/files/etc/uci-defaults/1970-omr-vnstat
@@ -1,25 +1,31 @@
 #!/bin/sh
 
-if [ "$(uci -q get vnstat.@vnstat[-1].interface | grep wan1)" = "" ]; then
+wanintf="$(uci -q get network.wan1.ifname)"
+if [ "$(uci -q get vnstat.@vnstat[-1].interface | grep $wanintf)" = "" ]; then
 	uci -q batch <<-EOF >/dev/null
 		delete vnstat.@vnstat[-1]
 		add vnstat vnstat
-		set vnstat.@vnstat[-1].interface="wan1"
-		add_list vnstat.@vnstat[-1].interface="wan2"
-		commit vnstat
+		set vnstat.@vnstat[-1].interface=$wanintf
+	EOF
+	wanintf="$(uci -q get network.wan2.ifname)"
+	uci -q batch <<-EOF >/dev/null
+		add_list vnstat.@vnstat[-1].interface=$wanintf
 	EOF
 	if [ "$(uci -q get network.wan3)" != "" ]; then
+		wanintf="$(uci -q get network.wan3.ifname)"
 		uci -q batch <<-EOF >/dev/null
-			add_list vnstat.@vnstat[-1].interface="wan3"
-			commit vnstat
+			add_list vnstat.@vnstat[-1].interface=$wanintf
 		EOF
 	fi
 	if [ "$(uci -q get network.wan4)" != "" ]; then
+		wanintf="$(uci -q get network.wan4.ifname)"
 		uci -q batch <<-EOF >/dev/null
-			add_list vnstat.@vnstat[-1].interface="wan4"
-			commit vnstat
+			add_list vnstat.@vnstat[-1].interface=$wanintf
 		EOF
 	fi
+	uci -q batch <<-EOF >/dev/null
+		commit vnstat
+	EOF
 fi
 rm -f /tmp/luci-indexcache
 echo '0 */2 * * * /etc/init.d/vnstat_backup backup' > /etc/crontabs/root