wireless-ap: Remove support for WPA

[network.git] / src / helpers / wpa_supplicant

diff --git a/src/helpers/wpa_supplicant b/src/helpers/wpa_supplicant
index 3d1aa947c5baf0c05117e841c3c93caf11fc9be1..7998801e03fe1b35d0a42d900656a4f69b491e21 100644 (file)
--- a/src/helpers/wpa_supplicant
+++ b/src/helpers/wpa_supplicant
@@ -21,19 +21,19 @@
 
 . /usr/lib/network/functions
 
-zone="${1}"
-assert isset zone
-assert zone_exists ${zone}
+# Read network settings
+network_settings_read
+
+device="${1}"
+assert isset device
 
 # Create socket dir.
 mkdir -p ${WPA_SUPPLICANT_SOCKET_DIR} 2>/dev/null
 
-config_file="$(wpa_supplicant_config_dir ${zone})/wpa_supplicant.conf"
-
-cmd="wpa_supplicant -i ${zone} -c ${config_file}"
+cmd="wpa_supplicant -i ${device} -c ${WPA_SUPPLICANT_CONF_DIR}/${device}.conf"
 
-if device_is_wireless ${zone}; then
-       cmd="${cmd} -Dwext"
+if device_is_wireless ${device}; then
+       cmd="${cmd} -Dnl80211"
 else
        cmd="${cmd} -Dwired"
 fi