瀏覽代碼

Tidy batman script

Bob Mottram 9 年之前
父節點
當前提交
85f576a093
共有 2 個檔案被更改,包括 12 行新增14 行删除
  1. 11
    9
      src/freedombone
  2. 1
    5
      src/freedombone-client

+ 11
- 9
src/freedombone 查看文件

1784
   echo 'BRIDGE=br-mesh' >> $batman_script
1784
   echo 'BRIDGE=br-mesh' >> $batman_script
1785
   echo 'IFACE=wlan0' >> $batman_script
1785
   echo 'IFACE=wlan0' >> $batman_script
1786
   echo 'EIFACE=eth0' >> $batman_script
1786
   echo 'EIFACE=eth0' >> $batman_script
1787
-  echo 'IFACE_EXISTS=$(grep "$IFACE" /proc/net/dev)' >> $batman_script
1787
+  echo '' >> $batman_script
1788
+  echo 'if grep -q "wlan1" /proc/net/dev; then' >> $batman_script
1789
+  echo '    IFACE=wlan1' >> $batman_script
1790
+  echo 'fi' >> $batman_script
1788
   echo '' >> $batman_script
1791
   echo '' >> $batman_script
1789
   echo 'if [ -e /etc/default/batctl ]; then' >> $batman_script
1792
   echo 'if [ -e /etc/default/batctl ]; then' >> $batman_script
1790
   echo '    . /etc/default/batctl' >> $batman_script
1793
   echo '    . /etc/default/batctl' >> $batman_script
1812
   echo '    modprobe batman-adv' >> $batman_script
1815
   echo '    modprobe batman-adv' >> $batman_script
1813
   echo '    batctl if add $IFACE' >> $batman_script
1816
   echo '    batctl if add $IFACE' >> $batman_script
1814
   echo '    ifconfig $IFACE up' >> $batman_script
1817
   echo '    ifconfig $IFACE up' >> $batman_script
1815
-  echo '    avahi-autoipd -D $IFACE' >> $batman_script
1816
   echo '    avahi-autoipd -D bat0' >> $batman_script
1818
   echo '    avahi-autoipd -D bat0' >> $batman_script
1817
-  echo '    avahi-autoipd -D $BRIDGE' >> $batman_script
1818
   echo '    ifconfig bat0 up promisc' >> $batman_script
1819
   echo '    ifconfig bat0 up promisc' >> $batman_script
1819
   echo '' >> $batman_script
1820
   echo '' >> $batman_script
1820
   echo '    #Use persistent HWAddr' >> $batman_script
1821
   echo '    #Use persistent HWAddr' >> $batman_script
1827
   echo '        ifconfig bat0 hw ether ${ether}' >> $batman_script
1828
   echo '        ifconfig bat0 hw ether ${ether}' >> $batman_script
1828
   echo '    fi' >> $batman_script
1829
   echo '    fi' >> $batman_script
1829
   echo '' >> $batman_script
1830
   echo '' >> $batman_script
1830
-  echo '    if [ "$EIFACE" ] ; then' >> $batman_script
1831
+  echo '    if [ "$EIFACE" ]; then' >> $batman_script
1831
   echo '        brctl addbr $BRIDGE' >> $batman_script
1832
   echo '        brctl addbr $BRIDGE' >> $batman_script
1832
   echo '        brctl addif $BRIDGE bat0' >> $batman_script
1833
   echo '        brctl addif $BRIDGE bat0' >> $batman_script
1833
   echo '        brctl addif $BRIDGE $EIFACE' >> $batman_script
1834
   echo '        brctl addif $BRIDGE $EIFACE' >> $batman_script
1857
   echo '        ifconfig $EIFACE down -promisc' >> $batman_script
1858
   echo '        ifconfig $EIFACE down -promisc' >> $batman_script
1858
   echo '    fi' >> $batman_script
1859
   echo '    fi' >> $batman_script
1859
   echo '' >> $batman_script
1860
   echo '' >> $batman_script
1861
+  echo '    avahi-autoipd -k bat0' >> $batman_script
1860
   echo '    ifconfig bat0 down -promisc' >> $batman_script
1862
   echo '    ifconfig bat0 down -promisc' >> $batman_script
1861
   echo '' >> $batman_script
1863
   echo '' >> $batman_script
1862
   echo '    batctl if del $IFACE' >> $batman_script
1864
   echo '    batctl if del $IFACE' >> $batman_script
1863
   echo '    rmmod batman-adv' >> $batman_script
1865
   echo '    rmmod batman-adv' >> $batman_script
1864
   echo '    ifconfig $IFACE mtu 1500' >> $batman_script
1866
   echo '    ifconfig $IFACE mtu 1500' >> $batman_script
1865
   echo '    ifconfig $IFACE down' >> $batman_script
1867
   echo '    ifconfig $IFACE down' >> $batman_script
1866
-  echo '    avahi-autoipd -k $IFACE' >> $batman_script
1867
-  echo '    avahi-autoipd -k bat0' >> $batman_script
1868
-  echo '    avahi-autoipd -k $BRIDGE' >> $batman_script
1869
   echo '    iwconfig $IFACE mode managed' >> $batman_script
1868
   echo '    iwconfig $IFACE mode managed' >> $batman_script
1870
   echo '' >> $batman_script
1869
   echo '' >> $batman_script
1871
   echo '    systemctl restart network-manager' >> $batman_script
1870
   echo '    systemctl restart network-manager' >> $batman_script
1872
   echo '}' >> $batman_script
1871
   echo '}' >> $batman_script
1873
   echo '' >> $batman_script
1872
   echo '' >> $batman_script
1874
-  echo 'if [ ! $IFACE_EXISTS ]; then' >> $batman_script
1873
+  echo 'if ! grep -q "$IFACE" /proc/net/dev; then' >> $batman_script
1875
   echo '    echo "Interface $IFACE was not found"' >> $batman_script
1874
   echo '    echo "Interface $IFACE was not found"' >> $batman_script
1876
   echo '    stop' >> $batman_script
1875
   echo '    stop' >> $batman_script
1877
   echo '    exit 1' >> $batman_script
1876
   echo '    exit 1' >> $batman_script
1886
   echo '        sleep 10' >> $batman_script
1885
   echo '        sleep 10' >> $batman_script
1887
   echo '        start' >> $batman_script
1886
   echo '        start' >> $batman_script
1888
   echo '        ;;' >> $batman_script
1887
   echo '        ;;' >> $batman_script
1888
+  echo '    status)' >> $batman_script
1889
+  echo '        batctl o' >> $batman_script
1890
+  echo '        ;;' >> $batman_script
1889
   echo '    ls|list)' >> $batman_script
1891
   echo '    ls|list)' >> $batman_script
1890
   echo '        avahi-browse -at' >> $batman_script
1892
   echo '        avahi-browse -at' >> $batman_script
1891
   echo '        ;;' >> $batman_script
1893
   echo '        ;;' >> $batman_script
1892
   echo '    *)' >> $batman_script
1894
   echo '    *)' >> $batman_script
1893
   echo '    echo "error: invalid parameter $1"' >> $batman_script
1895
   echo '    echo "error: invalid parameter $1"' >> $batman_script
1894
-  echo '    echo "usage: $0 {start|stop|restart|list|ls}"' >> $batman_script
1896
+  echo '    echo "usage: $0 {start|stop|restart|status|list|ls}"' >> $batman_script
1895
   echo '    exit 2' >> $batman_script
1897
   echo '    exit 2' >> $batman_script
1896
   echo '    ;;' >> $batman_script
1898
   echo '    ;;' >> $batman_script
1897
   echo 'esac' >> $batman_script
1899
   echo 'esac' >> $batman_script

+ 1
- 5
src/freedombone-client 查看文件

214
   echo '    modprobe batman-adv' >> $batman_script
214
   echo '    modprobe batman-adv' >> $batman_script
215
   echo '    batctl if add $IFACE' >> $batman_script
215
   echo '    batctl if add $IFACE' >> $batman_script
216
   echo '    ifconfig $IFACE up' >> $batman_script
216
   echo '    ifconfig $IFACE up' >> $batman_script
217
-  echo '    avahi-autoipd -D $IFACE' >> $batman_script
218
   echo '    avahi-autoipd -D bat0' >> $batman_script
217
   echo '    avahi-autoipd -D bat0' >> $batman_script
219
-  echo '    avahi-autoipd -D $BRIDGE' >> $batman_script
220
   echo '    ifconfig bat0 up promisc' >> $batman_script
218
   echo '    ifconfig bat0 up promisc' >> $batman_script
221
   echo '' >> $batman_script
219
   echo '' >> $batman_script
222
   echo '    #Use persistent HWAddr' >> $batman_script
220
   echo '    #Use persistent HWAddr' >> $batman_script
261
   echo '        ifconfig $EIFACE down -promisc' >> $batman_script
259
   echo '        ifconfig $EIFACE down -promisc' >> $batman_script
262
   echo '    fi' >> $batman_script
260
   echo '    fi' >> $batman_script
263
   echo '' >> $batman_script
261
   echo '' >> $batman_script
262
+  echo '    avahi-autoipd -k bat0' >> $batman_script
264
   echo '    ifconfig bat0 down -promisc' >> $batman_script
263
   echo '    ifconfig bat0 down -promisc' >> $batman_script
265
   echo '' >> $batman_script
264
   echo '' >> $batman_script
266
   echo '    batctl if del $IFACE' >> $batman_script
265
   echo '    batctl if del $IFACE' >> $batman_script
267
   echo '    rmmod batman-adv' >> $batman_script
266
   echo '    rmmod batman-adv' >> $batman_script
268
   echo '    ifconfig $IFACE mtu 1500' >> $batman_script
267
   echo '    ifconfig $IFACE mtu 1500' >> $batman_script
269
   echo '    ifconfig $IFACE down' >> $batman_script
268
   echo '    ifconfig $IFACE down' >> $batman_script
270
-  echo '    avahi-autoipd -k $IFACE' >> $batman_script
271
-  echo '    avahi-autoipd -k bat0' >> $batman_script
272
-  echo '    avahi-autoipd -k $BRIDGE' >> $batman_script
273
   echo '    iwconfig $IFACE mode managed' >> $batman_script
269
   echo '    iwconfig $IFACE mode managed' >> $batman_script
274
   echo '' >> $batman_script
270
   echo '' >> $batman_script
275
   echo '    iptables -D INPUT -i $IFACE -p udp --dport 5353 -j ACCEPT' >> $batman_script
271
   echo '    iptables -D INPUT -i $IFACE -p udp --dport 5353 -j ACCEPT' >> $batman_script