diff options
| author | Jo-Philipp Wich | 2011-09-06 22:05:27 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich | 2011-09-06 22:05:27 +0000 |
| commit | 5fecd9705ab7ae3b9384711037dc8804eee9ade7 (patch) | |
| tree | aded6bdb4109210a93da3d4321e6f2afeda00cf8 | |
| parent | 7b3207d98e97e9728fd5a560b7aaae4ec0f7b3f3 (diff) | |
| download | packages-5fecd9705ab7ae3b9384711037dc8804eee9ade7.tar.gz | |
merge r28187
SVN-Revision: 28188
| -rw-r--r-- | net/vnstat/Makefile | 12 | ||||
| -rw-r--r-- | net/vnstat/files/vnstat.defaults | 12 |
2 files changed, 16 insertions, 8 deletions
diff --git a/net/vnstat/Makefile b/net/vnstat/Makefile index e13c64ea3..efabd1708 100644 --- a/net/vnstat/Makefile +++ b/net/vnstat/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=vnstat PKG_VERSION:=1.11 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://humdi.net/vnstat @@ -89,6 +89,8 @@ define Package/vnstat/install $(INSTALL_CONF) ./files/vnstat-uci.conf $(1)/etc/config/vnstat $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/vnstat.init $(1)/etc/init.d/vnstat + $(INSTALL_DIR) $(1)/etc/uci-defaults + $(INSTALL_BIN) ./files/vnstat.defaults $(1)/etc/uci-defaults/vnstat endef define Package/vnstati/install @@ -98,13 +100,7 @@ endef define Package/vnstat/postinst #!/bin/sh -local wan="$$(uci -P/var/state get network.wan.ifname)" -if [ -n "$$wan" ]; then - uci -q batch <<-EOF >/dev/null - add_list vnstat.@vnstat[-1].interface=$$wan - commit vnstat - EOF -fi +[ -n "$${IPKG_INSTROOT}" ] || (. /etc/uci-defaults/vnstat) && rm -f /etc/uci-defaults/vnstat exit 0 endef diff --git a/net/vnstat/files/vnstat.defaults b/net/vnstat/files/vnstat.defaults new file mode 100644 index 000000000..a2d353f3f --- /dev/null +++ b/net/vnstat/files/vnstat.defaults @@ -0,0 +1,12 @@ +#!/bin/sh + +wan="$(uci -P/var/state get network.wan.ifname)" + +if [ -n "$wan" ]; then + uci -q batch <<-EOF >/dev/null + add_list vnstat.@vnstat[-1].interface=$wan + commit vnstat + EOF +fi + +exit 0 |