|
@@ -297,10 +297,8 @@ function wifi_wpa2_psk {
|
297
|
297
|
echo 'iface eth0 inet dhcp' >> /etc/network/interfaces
|
298
|
298
|
echo '' >> /etc/network/interfaces
|
299
|
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
|
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
|
303
|
wpa_passphrase "$ssid" "$passphrase" > $WIFI_CONFIG
|
306
|
304
|
|
|
@@ -325,10 +323,8 @@ function wifi_none {
|
325
|
323
|
echo 'iface eth0 inet dhcp' >> /etc/network/interfaces
|
326
|
324
|
echo '' >> /etc/network/interfaces
|
327
|
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
|
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
|
329
|
echo 'network={' > $WIFI_CONFIG
|
334
|
330
|
echo " ssid=\"${ssid}\"" >> $WIFI_CONFIG
|
|
@@ -363,10 +359,8 @@ function networks_from_file {
|
363
|
359
|
echo 'iface eth0 inet dhcp' >> /etc/network/interfaces
|
364
|
360
|
echo '' >> /etc/network/interfaces
|
365
|
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
|
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
|
365
|
# remove wpa_supplicant.conf if it exists
|
372
|
366
|
if [ -f $WIFI_CONFIG ]; then
|