Parcourir la source

Associate autoipd with bat0

Bob Mottram il y a 9 ans
Parent
révision
87c92d4d10
2 fichiers modifiés avec 4 ajouts et 8 suppressions
  1. 2
    4
      src/freedombone
  2. 2
    4
      src/freedombone-client

+ 2
- 4
src/freedombone Voir le fichier

@@ -1699,7 +1699,6 @@ function mesh_babel {
1699 1699
   echo '        echo "Interface $IFACE was not found"' >> $babel_script
1700 1700
   echo '    else' >> $babel_script
1701 1701
   echo '        echo "Stopping"' >> $babel_script
1702
-  echo '        avahi-autoipd -k $IFACE' >> $babel_script
1703 1702
   echo '    fi' >> $babel_script
1704 1703
   echo '    ifconfig $IFACE down' >> $babel_script
1705 1704
   echo '    pkill babeld' >> $babel_script
@@ -1720,7 +1719,6 @@ function mesh_babel {
1720 1719
   echo -n 'iwconfig $IFACE mode ad-hoc channel ' >> $babel_script
1721 1720
   echo "$WIFI_CHANNEL essid \"$ESSID\"" >> $babel_script
1722 1721
   echo 'ifconfig $IFACE up' >> $babel_script
1723
-  echo 'avahi-autoipd $IFACE' >> $babel_script
1724 1722
   echo -n 'ifconfig $IFACE:avahi ' >> $babel_script
1725 1723
   echo -n "$LOCAL_NETWORK_STATIC_IP_ADDRESS netmask " >> $babel_script
1726 1724
   echo '255.255.255.0 broadcast 192.168.13.255' >> $babel_script
@@ -1814,7 +1812,7 @@ function mesh_batman_bridge {
1814 1812
   echo '    modprobe batman-adv' >> $batman_script
1815 1813
   echo '    batctl if add $IFACE' >> $batman_script
1816 1814
   echo '    ifconfig $IFACE up' >> $batman_script
1817
-  echo '    avahi-autoipd -D $IFACE' >> $batman_script
1815
+  echo '    avahi-autoipd -D bat0' >> $batman_script
1818 1816
   echo '    ifconfig bat0 up promisc' >> $batman_script
1819 1817
   echo '' >> $batman_script
1820 1818
   echo '    #Use persistent HWAddr' >> $batman_script
@@ -1856,7 +1854,7 @@ function mesh_batman_bridge {
1856 1854
   echo '    rmmod batman-adv' >> $batman_script
1857 1855
   echo '    ifconfig $IFACE mtu 1500' >> $batman_script
1858 1856
   echo '    ifconfig $IFACE down' >> $batman_script
1859
-  echo '    avahi-autoipd -k $IFACE' >> $batman_script
1857
+  echo '    avahi-autoipd -k bat0' >> $batman_script
1860 1858
   echo '    iwconfig $IFACE mode managed' >> $batman_script
1861 1859
   echo '' >> $batman_script
1862 1860
   echo '    systemctl restart network-manager' >> $batman_script

+ 2
- 4
src/freedombone-client Voir le fichier

@@ -122,7 +122,6 @@ function mesh_babel {
122 122
   echo '        echo "Interface $IFACE was not found"' >> $babel_script
123 123
   echo '    else' >> $babel_script
124 124
   echo '        echo "Stopping"' >> $babel_script
125
-  echo '        avahi-autoipd -k $IFACE' >> $babel_script
126 125
   echo '    fi' >> $babel_script
127 126
   echo '    ifconfig $IFACE down' >> $babel_script
128 127
   echo '    pkill babeld' >> $babel_script
@@ -143,7 +142,6 @@ function mesh_babel {
143 142
   echo -n 'iwconfig $IFACE mode ad-hoc channel ' >> $babel_script
144 143
   echo "$WIFI_CHANNEL essid \"$ESSID\"" >> $babel_script
145 144
   echo 'ifconfig $IFACE up' >> $babel_script
146
-  echo 'avahi-autoipd -D $IFACE' >> $babel_script
147 145
   echo -n 'ifconfig $IFACE:avahi ' >> $babel_script
148 146
   echo -n "$LOCAL_NETWORK_STATIC_IP_ADDRESS netmask " >> $babel_script
149 147
   echo '255.255.255.0 broadcast 192.168.13.255' >> $babel_script
@@ -221,7 +219,7 @@ function mesh_batman {
221 219
   echo '    modprobe batman-adv' >> $batman_script
222 220
   echo '    batctl if add $IFACE' >> $batman_script
223 221
   echo '    ifconfig $IFACE up' >> $batman_script
224
-  echo '    avahi-autoipd -D $IFACE' >> $batman_script
222
+  echo '    avahi-autoipd -D bat0' >> $batman_script
225 223
   echo '    ifconfig bat0 up promisc' >> $batman_script
226 224
   echo '' >> $batman_script
227 225
   echo '    #Use persistent HWAddr' >> $batman_script
@@ -263,7 +261,7 @@ function mesh_batman {
263 261
   echo '    rmmod batman-adv' >> $batman_script
264 262
   echo '    ifconfig $IFACE mtu 1500' >> $batman_script
265 263
   echo '    ifconfig $IFACE down' >> $batman_script
266
-  echo '    avahi-autoipd -k $IFACE' >> $batman_script
264
+  echo '    avahi-autoipd -k bat0' >> $batman_script
267 265
   echo '    iwconfig $IFACE mode managed' >> $batman_script
268 266
   echo '' >> $batman_script
269 267
   echo '    if [ -f /bin/systemctl ]; then' >> $batman_script