Bob Mottram 9 年 前
コミット
1a907219b0
共有1 個のファイルを変更した3 個の追加9 個の削除を含む
  1. 3
    9
      src/freedombone-utils-wifi

+ 3
- 9
src/freedombone-utils-wifi ファイルの表示

297
     echo 'iface eth0 inet dhcp' >> /etc/network/interfaces
297
     echo 'iface eth0 inet dhcp' >> /etc/network/interfaces
298
     echo '' >> /etc/network/interfaces
298
     echo '' >> /etc/network/interfaces
299
     echo "allow-hotplug ${WIFI_INTERFACE}" >> /etc/network/interfaces
299
     echo "allow-hotplug ${WIFI_INTERFACE}" >> /etc/network/interfaces
300
-    echo "iface ${WIFI_INTERFACE} inet manual" >> /etc/network/interfaces
300
+    echo "iface ${WIFI_INTERFACE} inet dhcp" >> /etc/network/interfaces
301
     echo "  wpa-roam $WIFI_CONFIG" >> /etc/network/interfaces
301
     echo "  wpa-roam $WIFI_CONFIG" >> /etc/network/interfaces
302
-    echo '' >> /etc/network/interfaces
303
-    echo 'iface default inet dhcp' >> /etc/network/interfaces
304
 
302
 
305
     wpa_passphrase "$ssid" "$passphrase" > $WIFI_CONFIG
303
     wpa_passphrase "$ssid" "$passphrase" > $WIFI_CONFIG
306
 
304
 
325
     echo 'iface eth0 inet dhcp' >> /etc/network/interfaces
323
     echo 'iface eth0 inet dhcp' >> /etc/network/interfaces
326
     echo '' >> /etc/network/interfaces
324
     echo '' >> /etc/network/interfaces
327
     echo "allow-hotplug ${WIFI_INTERFACE}" >> /etc/network/interfaces
325
     echo "allow-hotplug ${WIFI_INTERFACE}" >> /etc/network/interfaces
328
-    echo "iface ${WIFI_INTERFACE} inet manual" >> /etc/network/interfaces
326
+    echo "iface ${WIFI_INTERFACE} inet dhcp" >> /etc/network/interfaces
329
     echo "  wpa-roam $WIFI_CONFIG" >> /etc/network/interfaces
327
     echo "  wpa-roam $WIFI_CONFIG" >> /etc/network/interfaces
330
-    echo '' >> /etc/network/interfaces
331
-    echo 'iface default inet dhcp' >> /etc/network/interfaces
332
 
328
 
333
     echo 'network={' > $WIFI_CONFIG
329
     echo 'network={' > $WIFI_CONFIG
334
     echo "  ssid=\"${ssid}\"" >> $WIFI_CONFIG
330
     echo "  ssid=\"${ssid}\"" >> $WIFI_CONFIG
363
     echo 'iface eth0 inet dhcp' >> /etc/network/interfaces
359
     echo 'iface eth0 inet dhcp' >> /etc/network/interfaces
364
     echo '' >> /etc/network/interfaces
360
     echo '' >> /etc/network/interfaces
365
     echo "allow-hotplug ${WIFI_INTERFACE}" >> /etc/network/interfaces
361
     echo "allow-hotplug ${WIFI_INTERFACE}" >> /etc/network/interfaces
366
-    echo "iface ${WIFI_INTERFACE} inet manual" >> /etc/network/interfaces
362
+    echo "iface ${WIFI_INTERFACE} inet dhcp" >> /etc/network/interfaces
367
     echo "  wpa-roam $WIFI_CONFIG" >> /etc/network/interfaces
363
     echo "  wpa-roam $WIFI_CONFIG" >> /etc/network/interfaces
368
-    echo '' >> /etc/network/interfaces
369
-    echo 'iface default inet dhcp' >> /etc/network/interfaces
370
 
364
 
371
     # remove wpa_supplicant.conf if it exists
365
     # remove wpa_supplicant.conf if it exists
372
     if [ -f $WIFI_CONFIG ]; then
366
     if [ -f $WIFI_CONFIG ]; then