AA: vnstat: merge r36716 (#13577)

git-svn-id: svn://svn.openwrt.org/openwrt/branches/packages_12.09@36846 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/net/vnstat/Makefile b/net/vnstat/Makefile
index 577a314..93d11c9 100644 (file)
--- a/net/vnstat/Makefile
+++ b/net/vnstat/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2011 OpenWrt.org
+# Copyright (C) 2006-2013 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=vnstat
 PKG_VERSION:=1.11
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://humdi.net/vnstat

diff --git a/net/vnstat/files/vnstat.defaults b/net/vnstat/files/vnstat.defaults
index a2d353f..e013b8e 100644 (file)
--- a/net/vnstat/files/vnstat.defaults
+++ b/net/vnstat/files/vnstat.defaults
@@ -4,6 +4,7 @@ wan="$(uci -P/var/state get network.wan.ifname)"
 
 if [ -n "$wan" ]; then
        uci -q batch <<-EOF >/dev/null
+               del_list vnstat.@vnstat[-1].interface=$wan
                add_list vnstat.@vnstat[-1].interface=$wan
                commit vnstat
        EOF