diff --git a/config/network/interfaces.default b/config/network/interfaces.default index 627b688607..2146ad1947 100644 --- a/config/network/interfaces.default +++ b/config/network/interfaces.default @@ -1,7 +1,7 @@ # Wired adapter #1 #allow-hotplug eth0 #no-auto-down eth0 -#iface eth0 inet dhcp +iface eth0 inet dhcp #address 192.168.0.100 #netmask 255.255.255.0 #gateway 192.168.0.1 @@ -11,7 +11,7 @@ # Wired adapter #2 #allow-hotplug eth1 -#iface eth1 inet dhcp +iface eth1 inet dhcp #address 192.168.0.100 #netmask 255.255.255.0 #gateway 192.168.0.1 @@ -21,7 +21,7 @@ # Wireless adapter #1 #allow-hotplug wlan0 -#iface wlan0 inet dhcp +iface wlan0 inet dhcp #address 192.168.0.100 #netmask 255.255.255.0 #gateway 192.168.0.1 diff --git a/scripts/firstrun b/scripts/firstrun index c80c85d519..23a38d8d71 100644 --- a/scripts/firstrun +++ b/scripts/firstrun @@ -258,8 +258,8 @@ do_firstrun_automated_user_configuration() { #Set Network # - Grab user requested settings - local ethernet_enabled=$(cat "$fp_config" | grep -ci -m1 'ethernet_enabled=1') - local wifi_enabled=$(cat "$fp_config" | grep -ci -m1 'wifi_enabled=1') + local ethernet_enabled=$(cat "$fp_config" | grep -ci -m1 '^ethernet_enabled=1') + local wifi_enabled=$(cat "$fp_config" | grep -ci -m1 '^wifi_enabled=1') local wifi_ssid=$(cat "$fp_config" | grep -m1 '^wifi_ssid=' | sed 's/.*=//') local wifi_key=$(cat "$fp_config" | grep -m1 '^wifi_key=' | sed 's/.*=//')