From 8fd134ed2ab7a172b1ac1c9b6b9148552048a76b Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Mon, 15 Jan 2018 14:11:23 +0000
Subject: [PATCH] Update bmx devices within daemons
---
src/freedombone-mesh-batman | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/src/freedombone-mesh-batman b/src/freedombone-mesh-batman
index c7d00ed52..7aac0da65 100755
--- a/src/freedombone-mesh-batman
+++ b/src/freedombone-mesh-batman
@@ -198,10 +198,14 @@ function start {
modprobe batman-adv
- # avahi on ipv4
+ # avahi on ipv6
sed -i 's|use-ipv4=.*|use-ipv4=no|g' /etc/avahi/avahi-daemon.conf
sed -i 's|use-ipv6=.*|use-ipv6=yes|g' /etc/avahi/avahi-daemon.conf
+ sed -i "s|ExecStart=.*|ExecStart=/usr/sbin/bmx6 dev=${IFACE}|g" /etc/systemd/system/bmx6.service
+ sed -i "s|ExecStart=.*|ExecStart=/usr/sbin/bmx7 dev=${IFACE}|g" /etc/systemd/system/bmx7.service
+ systemctl daemon-reload
+
add_wifi_interface $IFACE $WIFI_SSID ad-hoc $CHANNEL
# NOTE: Don't connect the secondary wifi device. hostapd will handle that by itself
@@ -220,6 +224,10 @@ function start {
ifconfig $EIFACE 0.0.0.0
ifconfig $EIFACE up promisc
echo $'End of ethernet bridge'
+
+ sed -i "s|ExecStart=.*|ExecStart=/usr/sbin/bmx6 dev=${IFACE} dev=${EIFACE}|g" /etc/systemd/system/bmx6.service
+ sed -i "s|ExecStart=.*|ExecStart=/usr/sbin/bmx7 dev=${IFACE} dev=${EIFACE}|g" /etc/systemd/system/bmx7.service
+ systemctl daemon-reload
else
echo $"$EIFACE is not connected"
fi
@@ -243,8 +251,10 @@ function start {
fi
if grep -q "bmx6" $MESH_DEFAULT_PROTOCOL; then
+ systemctl enable bmx6
systemctl restart bmx6
else
+ systemctl enable bmx7
systemctl restart bmx7
fi
--
GitLab