contrib/package/freifunk-p2pblock: actually read whitelist from config

diff --git a/contrib/package/freifunk-p2pblock/Makefile b/contrib/package/freifunk-p2pblock/Makefile
index 2dbe1fa7cac065019bd7536a6e873225c49e6403..6bf3a9610412b3290036d7c0992786cc5351f04e 100644 (file)
--- a/contrib/package/freifunk-p2pblock/Makefile
+++ b/contrib/package/freifunk-p2pblock/Makefile
@@ -1,5 +1,6 @@
 #
 # Copyright (C) 2009 Andreas Seidler <tetzlav@subsignal.org>
+# Copyright (C) 2012 Jo-Philipp Wich <xm@subsignal.org>
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,7 +9,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=freifunk-p2pblock
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 

diff --git a/contrib/package/freifunk-p2pblock/files/freifunk-p2pblock.init b/contrib/package/freifunk-p2pblock/files/freifunk-p2pblock.init
index aa8b1c8bcbf3d16b678d5d87634b79fcec03bc6f..5ca60c891696ea6c6c461c7eba3b475a07dc5050 100644 (file)
--- a/contrib/package/freifunk-p2pblock/files/freifunk-p2pblock.init
+++ b/contrib/package/freifunk-p2pblock/files/freifunk-p2pblock.init
@@ -26,6 +26,7 @@ start() {
                        config_get ipp2p p2pblock ipp2p
                        config_get portrange p2pblock portrange
                        config_get blocktime p2pblock blocktime
+                       config_get whitelist p2pblock whitelist
 
                        # load modules
                        insmod ipt_ipp2p 2>&-