瀏覽代碼

Associate autoipd with bat0

Bob Mottram 9 年之前
父節點
當前提交
87c92d4d10
共有 2 個檔案被更改,包括 4 行新增8 行删除
  1. 2
    4
      src/freedombone
  2. 2
    4
      src/freedombone-client

+ 2
- 4
src/freedombone 查看文件

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

+ 2
- 4
src/freedombone-client 查看文件

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