瀏覽代碼

network-manage all the things

Bob Mottram 10 年之前
父節點
當前提交
72878e6511
共有 2 個文件被更改,包括 9 次插入9 次删除
  1. 5
    5
      src/freedombone
  2. 4
    4
      src/freedombone-client

+ 5
- 5
src/freedombone 查看文件

1482
       echo '    pre-up modprobe ipv6' >> /etc/network/interfaces
1482
       echo '    pre-up modprobe ipv6' >> /etc/network/interfaces
1483
       echo '    address fdfc:0000:0000:0000:0000:0000:0000:0001' >> /etc/network/interfaces
1483
       echo '    address fdfc:0000:0000:0000:0000:0000:0000:0001' >> /etc/network/interfaces
1484
       echo '    netmask 64' >> /etc/network/interfaces
1484
       echo '    netmask 64' >> /etc/network/interfaces
1485
-      service networking restart
1485
+      service network-manager restart
1486
       if [ ! "$?" = "0" ]; then
1486
       if [ ! "$?" = "0" ]; then
1487
           systemctl status networking.service
1487
           systemctl status networking.service
1488
           exit 6949
1488
           exit 6949
1679
   echo 'if [[ ! $IFACE_EXISTS || $1 == "stop" ]]; then' >> $babel_script
1679
   echo 'if [[ ! $IFACE_EXISTS || $1 == "stop" ]]; then' >> $babel_script
1680
   echo '    echo "Interface $IFACE was not found"' >> $babel_script
1680
   echo '    echo "Interface $IFACE was not found"' >> $babel_script
1681
   echo '    ifconfig $IFACE down' >> $babel_script
1681
   echo '    ifconfig $IFACE down' >> $babel_script
1682
-  echo '    systemctl restart networking' >> $babel_script
1682
+  echo '    systemctl restart network-manager' >> $babel_script
1683
   echo '    exit 1' >> $babel_script
1683
   echo '    exit 1' >> $babel_script
1684
   echo 'fi' >> $babel_script
1684
   echo 'fi' >> $babel_script
1685
   echo '' >> $babel_script
1685
   echo '' >> $babel_script
1686
-  echo 'systemctl stop networking' >> $babel_script
1686
+  echo 'systemctl stop network-manager' >> $babel_script
1687
   echo 'ifconfig $IFACE down' >> $babel_script
1687
   echo 'ifconfig $IFACE down' >> $babel_script
1688
   echo -n 'iwconfig $IFACE mode ad-hoc channel ' >> $babel_script
1688
   echo -n 'iwconfig $IFACE mode ad-hoc channel ' >> $babel_script
1689
   echo "$WIFI_CHANNEL essid \"$ESSID\"" >> $babel_script
1689
   echo "$WIFI_CHANNEL essid \"$ESSID\"" >> $babel_script
1765
   echo '        return' >> $batman_script
1765
   echo '        return' >> $batman_script
1766
   echo '    fi' >> $batman_script
1766
   echo '    fi' >> $batman_script
1767
   echo '    echo "info: enabling batman-adv mesh network $ESSID on $IFACE"' >> $batman_script
1767
   echo '    echo "info: enabling batman-adv mesh network $ESSID on $IFACE"' >> $batman_script
1768
-  echo '    systemctl stop networking' >> $batman_script
1768
+  echo '    systemctl stop network-manager' >> $batman_script
1769
   echo '    sleep 5' >> $batman_script
1769
   echo '    sleep 5' >> $batman_script
1770
   echo '' >> $batman_script
1770
   echo '' >> $batman_script
1771
   echo '    # Might have to re-enable wifi' >> $batman_script
1771
   echo '    # Might have to re-enable wifi' >> $batman_script
1824
   echo '    ifconfig $IFACE down' >> $batman_script
1824
   echo '    ifconfig $IFACE down' >> $batman_script
1825
   echo '    iwconfig $IFACE mode managed' >> $batman_script
1825
   echo '    iwconfig $IFACE mode managed' >> $batman_script
1826
   echo '' >> $batman_script
1826
   echo '' >> $batman_script
1827
-  echo '    systemctl restart networking' >> $batman_script
1827
+  echo '    systemctl restart network-manager' >> $batman_script
1828
   echo '}' >> $batman_script
1828
   echo '}' >> $batman_script
1829
   echo '' >> $batman_script
1829
   echo '' >> $batman_script
1830
   echo 'if [ ! $IFACE_EXISTS ]; then' >> $batman_script
1830
   echo 'if [ ! $IFACE_EXISTS ]; then' >> $batman_script

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

126
   echo '    ifconfig $IFACE down' >> $babel_script
126
   echo '    ifconfig $IFACE down' >> $babel_script
127
   echo '    pkill babeld' >> $babel_script
127
   echo '    pkill babeld' >> $babel_script
128
   echo '    if [ -f /bin/systemctl ]; then' >> $babel_script
128
   echo '    if [ -f /bin/systemctl ]; then' >> $babel_script
129
-  echo '        systemctl restart networking' >> $babel_script
129
+  echo '        systemctl restart network-manager' >> $babel_script
130
   echo '    else' >> $babel_script
130
   echo '    else' >> $babel_script
131
   echo '        service network-manager restart' >> $babel_script
131
   echo '        service network-manager restart' >> $babel_script
132
   echo '    fi' >> $babel_script
132
   echo '    fi' >> $babel_script
134
   echo 'fi' >> $babel_script
134
   echo 'fi' >> $babel_script
135
   echo '' >> $babel_script
135
   echo '' >> $babel_script
136
   echo 'if [ -f /bin/systemctl ]; then' >> $babel_script
136
   echo 'if [ -f /bin/systemctl ]; then' >> $babel_script
137
-  echo '    systemctl stop networking' >> $babel_script
137
+  echo '    systemctl stop network-manager' >> $babel_script
138
   echo 'else' >> $babel_script
138
   echo 'else' >> $babel_script
139
   echo '    service network-manager stop' >> $babel_script
139
   echo '    service network-manager stop' >> $babel_script
140
   echo 'fi' >> $babel_script
140
   echo 'fi' >> $babel_script
200
   echo '    echo "info: enabling batman-adv mesh network $ESSID on $IFACE"' >> $batman_script
200
   echo '    echo "info: enabling batman-adv mesh network $ESSID on $IFACE"' >> $batman_script
201
 
201
 
202
   echo '    if [ -f /bin/systemctl ]; then' >> $batman_script
202
   echo '    if [ -f /bin/systemctl ]; then' >> $batman_script
203
-  echo '        systemctl stop networking' >> $batman_script
203
+  echo '        systemctl stop network-manager' >> $batman_script
204
   echo '    else' >> $batman_script
204
   echo '    else' >> $batman_script
205
   echo '        service network-manager stop' >> $batman_script
205
   echo '        service network-manager stop' >> $batman_script
206
   echo '    fi' >> $batman_script
206
   echo '    fi' >> $batman_script
263
   echo '    iwconfig $IFACE mode managed' >> $batman_script
263
   echo '    iwconfig $IFACE mode managed' >> $batman_script
264
   echo '' >> $batman_script
264
   echo '' >> $batman_script
265
   echo '    if [ -f /bin/systemctl ]; then' >> $batman_script
265
   echo '    if [ -f /bin/systemctl ]; then' >> $batman_script
266
-  echo '        systemctl restart networking' >> $batman_script
266
+  echo '        systemctl restart network-manager' >> $batman_script
267
   echo '    else' >> $batman_script
267
   echo '    else' >> $batman_script
268
   echo '        service network-manager restart' >> $batman_script
268
   echo '        service network-manager restart' >> $batman_script
269
   echo '    fi' >> $batman_script
269
   echo '    fi' >> $batman_script