contrib/freifunk-gwcheck: Fix uci-defaults, add olsrd-mod-dyn-gw-plain depency

diff --git a/contrib/package/freifunk-gwcheck/Makefile b/contrib/package/freifunk-gwcheck/Makefile
index 4922c236c8df95bae76648fa18c25c9784d24a56..ddadc053bdac114cf49752d7bf315e45cd30b9e8 100644 (file)
--- a/contrib/package/freifunk-gwcheck/Makefile
+++ b/contrib/package/freifunk-gwcheck/Makefile
@@ -15,7 +15,7 @@ define Package/freifunk-gwcheck
   CATEGORY:=LuCI
   SUBMENU:=Freifunk
   TITLE:=Freifunk gateway check script
-  DEPENDS:=+firewall +ip +iptables-mod-ipopt
+  DEPENDS:=+firewall +ip +iptables-mod-ipopt +olsrd-mod-dyn-gw-plain
 endef
 
 define Package/freifunk-gwcheck/description

diff --git a/contrib/package/freifunk-gwcheck/root/etc/uci-defaults/freifunk-gwcheck b/contrib/package/freifunk-gwcheck/root/etc/uci-defaults/freifunk-gwcheck
index e0574e64061df76e475f1e92e7e71a335bba3b6e..e04faa5629cf17a64e76dd56fbc4d5c1b412cc88 100644 (file)
--- a/contrib/package/freifunk-gwcheck/root/etc/uci-defaults/freifunk-gwcheck
+++ b/contrib/package/freifunk-gwcheck/root/etc/uci-defaults/freifunk-gwcheck
@@ -1,6 +1,6 @@
 #!/bin/sh
 tables="/etc/iproute2/rt_tables"
-[ -z "`grep -q "gw-check" $tables`" ] && echo "200 gw-check" >> $tables
+grep -q "gw-check" $tables || echo "200 gw-check" >> $tables
 test -f /etc/crontabs/root || touch /etc/crontabs/root
-[ -z "`grep -q "ff_olsr_test_gw.sh" /etc/crontabs/root`" ] && echo "* * * * *  /usr/sbin/ff_olsr_test_gw.sh" >> /etc/crontabs/root
+grep -q "ff_olsr_test_gw.sh" /etc/crontabs/root || echo "* * * * *     /usr/sbin/ff_olsr_test_gw.sh" >> /etc/crontabs/root
 /etc/init.d/cron restart