From 297375027507487403b5791c8ff7966e5e31a67e Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 22 Aug 2015 23:24:28 +0200 Subject: [PATCH] Revert "Enable babel meshing, disable batman" This reverts commit c3fa48399683252060b644a47b10d6b3b4191795. --- site.conf | 4 ---- site.mk | 7 +++++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/site.conf b/site.conf index 1e7e275..1976a5a 100644 --- a/site.conf +++ b/site.conf @@ -48,10 +48,6 @@ }, }, - babel_mesh = { - prefix = 'fdef:ffc0:4fff:ffff::/64', - }, - next_node = { ip4 = '10.80.0.1', ip6 = 'fdef:ffc0:4fff::1', diff --git a/site.mk b/site.mk index bf6d2f9..e3e819b 100644 --- a/site.mk +++ b/site.mk @@ -1,5 +1,5 @@ GLUON_SITE_PACKAGES := \ - gluon-mesh-babel \ + gluon-mesh-batman-adv-15 \ gluon-alfred \ gluon-announced \ gluon-autoupdater \ @@ -23,7 +23,10 @@ GLUON_SITE_PACKAGES := \ gluon-status-page \ iwinfo \ iptables \ - haveged + haveged \ + gluon-ebtables-filter-arp-ffmuc \ + gluon-ebtables-filter-multicast-ffmuc + DEFAULT_GLUON_RELEASE := snapshot~$(shell date '+%Y%m%d')