From patchwork Tue May  3 21:20:54 2016
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [RFC,
 5/8] removed dhcp configuration from fff-hoods because no dhcp server
 is in use
From: Jan Kraus <mayosemmel@googlemail.com>
X-Patchwork-Id: 99
Message-Id: <1462310457-9633-6-git-send-email-mayosemmel@gmail.com>
To: franken-dev@freifunk.net
Cc: Jan Kraus <mayosemmel@gmail.com>
Date: Tue,  3 May 2016 23:20:54 +0200

moved IPv6-Hood configuration from configurehood to configurenetwork

Signed-off-by: Jan Kraus <mayosemmel@gmail.com>
---
 src/packages/fff/fff-hoods/Makefile                    |  2 +-
 .../fff/fff-hoods/files/etc/uci-defaults/hood-dhcp     | 18 ------------------
 .../fff/fff-hoods/files/usr/sbin/configurehood         | 14 ++++----------
 3 files changed, 5 insertions(+), 29 deletions(-)
 delete mode 100644 src/packages/fff/fff-hoods/files/etc/uci-defaults/hood-dhcp

diff --git a/src/packages/fff/fff-hoods/Makefile b/src/packages/fff/fff-hoods/Makefile
index bf92689..ac48760 100644
--- a/src/packages/fff/fff-hoods/Makefile
+++ b/src/packages/fff/fff-hoods/Makefile
@@ -13,7 +13,7 @@ define Package/fff-hoods
     CATEGORY:=Freifunk
     TITLE:= Freifunk-Franken hoods
     URL:=http://www.freifunk-franken.de
-    DEPENDS:=+mdns +odhcpd
+    DEPENDS:=+mdns +fff-network
 endef
 
 define Package/fff-hoods/description
diff --git a/src/packages/fff/fff-hoods/files/etc/uci-defaults/hood-dhcp b/src/packages/fff/fff-hoods/files/etc/uci-defaults/hood-dhcp
deleted file mode 100644
index d9fdb6d..0000000
--- a/src/packages/fff/fff-hoods/files/etc/uci-defaults/hood-dhcp
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
->/etc/config/dhcp
-
-uci batch <<EOF
-set dhcp.odhcpd=odhcpd
-set dhcp.odhcpd.maindhcp=0
-set dhcp.odhcpd.leasefile=/tmp/hosts/odhcpd
-set dhcp.odhcpd.leasetrigger=/usr/sbin/odhcpd-update
-set dhcp.local=dhcp
-set dhcp.local.interface=mesh
-set dhcp.local.ra=server
-set dhcp.local.dhcpv6=server
-set dhcp.local.dhcpv4=disabled
-set dhcp.local.ndp=disabled
-set dhcp.local.ra_default=0
-set dhcp.local.ra_preference=low
-commit dhcp
-EOF
diff --git a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood
index 4b952fc..0fa20fd 100755
--- a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood
+++ b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood
@@ -131,15 +131,9 @@ uci -q batch <<-EOF >/dev/null
     commit network
 EOF
 
-echo "Restarting network"
-for ip in $(ip -6 addr show br-mesh | awk '/fdff/{ print $2 }'); do
-    ip -6 addr del $ip dev br-mesh
-done
-ip -6 addr add $addr dev br-mesh
-#/etc/init.d/odhcpd stop
-#/etc/init.d/network restart
-#/etc/init.d/odhcpd start
-
-echo "Finding fastd Gateways, if online. Configure fastd."
+. /usr/sbin/configurenetwork
 
+# ==TODO==
+#echo "Finding fastd Gateways, if online. Configure fastd."
+# =======
 echo "Done"