[package] install bandwidthd logo (#7794)

SVN-Revision: 23013

diff --git a/utils/bandwidthd/Makefile b/utils/bandwidthd/Makefile
index 415284acf5777d6cd22b48030f913e51419a97bf..3121c68d073dea0fb63a7817037785cba14fa56f 100644 (file)
--- a/utils/bandwidthd/Makefile
+++ b/utils/bandwidthd/Makefile
@@ -1,5 +1,5 @@
 # 
 # 

-# Copyright (C) 2006-2009 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # 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:=bandwidthd
 PKG_VERSION:=2.0.1
 
 PKG_NAME:=bandwidthd
 PKG_VERSION:=2.0.1

-PKG_RELEASE:=1
+PKG_RELEASE:=2

 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=@SF/bandwidthd
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=@SF/bandwidthd


@@ -50,6 +50,7 @@ define Package/bandwidthd/install
        $(INSTALL_BIN) ./files/bandwidthd.init $(1)/etc/init.d/bandwidthd
        $(INSTALL_DIR) $(1)/www
        $(INSTALL_DATA) $(PKG_BUILD_DIR)/htdocs/legend.gif $(1)/www/
        $(INSTALL_BIN) ./files/bandwidthd.init $(1)/etc/init.d/bandwidthd
        $(INSTALL_DIR) $(1)/www
        $(INSTALL_DATA) $(PKG_BUILD_DIR)/htdocs/legend.gif $(1)/www/

+       $(INSTALL_DATA) $(PKG_BUILD_DIR)/htdocs/logo.gif $(1)/www/

 endef
 
 $(eval $(call BuildPackage,bandwidthd))
 endef
 
 $(eval $(call BuildPackage,bandwidthd))

diff --git a/utils/bandwidthd/files/bandwidthd.init b/utils/bandwidthd/files/bandwidthd.init
index 2d53ac3c6867fe7f4c52ce06c02fbffac404cd19..3b3819ddd4ee67a819c916706ad3fae33d018da7 100644 (file)
--- a/utils/bandwidthd/files/bandwidthd.init
+++ b/utils/bandwidthd/files/bandwidthd.init
@@ -52,7 +52,7 @@ export_string() {
 start() {
        local subnet conffile
 
 start() {
        local subnet conffile
 

-       [ -d /tmp/bandwidthd ] || mkdir -p /tmp/bandwidthd && cp /www/legend.gif /tmp/bandwidthd/
+       [ -d /tmp/bandwidthd ] || mkdir -p /tmp/bandwidthd && cp /www/legend.gif /www/logo.gif /tmp/bandwidthd/

        [ -e /htdocs ] || ln -s /tmp/bandwidthd /htdocs
        [ -e /www/bandwidthd ] || ln -s /tmp/bandwidthd /www/bandwidthd
        rm -f /tmp/bandwidthd.conf
        [ -e /htdocs ] || ln -s /tmp/bandwidthd /htdocs
        [ -e /www/bandwidthd ] || ln -s /tmp/bandwidthd /www/bandwidthd
        rm -f /tmp/bandwidthd.conf

diff --git a/utils/bandwidthd/files/logo.gif b/utils/bandwidthd/files/logo.gif
new file mode 100644 (file)
index 0000000..7b17cc6
Binary files /dev/null and b/utils/bandwidthd/files/logo.gif differ