NETWORK_IPSEC_SWANCTL_CONNECTIONS_DIR="/etc/swanctl/connections"
NETWORK_IPSEC_SWANCTL_POOLS_DIR="/etc/swanctl/pools"
+# WPA supplicant
+WPA_SUPPLICANT_CONF_DIR="/etc/wpa_supplicant"
+
# Network file configuration.
NETWORK_SETTINGS_FILE=${NETWORK_CONFIG_DIR}/config
NETWORK_SETTINGS_FILE_PARAMS="DEBUG"
assert isset device
- local file="$(wpa_supplicant_config_dir "${device}")/wpa_supplicant.conf"
+ local file="${WPA_SUPPLICANT_CONF_DIR}/${device}.conf"
local ap_scan=1 mode key ssid
local channel
;;
esac
- local config_dir=$(dirname ${file})
- mkdir -p ${config_dir} 2>/dev/null
+ # Ensure we can write the file
+ make_parent_dir "${file}"
config_header "WPA supplicant configuration file" > ${file}
local device="${1}"
assert isset device
- local file="$(wpa_supplicant_config_dir "${device}")/wpa_supplicant.conf"
-
- file_delete "${file}"
-}
-
-wpa_supplicant_config_dir() {
- local device=${1}
- assert isset device
-
- echo "${RUN_DIR}/wpa_supplicant/${device}"
+ file_delete "${WPA_SUPPLICANT_CONF_DIR}/${device}.conf"
}
wpa_supplicant_start() {
# Create socket dir.
mkdir -p ${WPA_SUPPLICANT_SOCKET_DIR} 2>/dev/null
-config_file="$(wpa_supplicant_config_dir ${device})/wpa_supplicant.conf"
-
-cmd="wpa_supplicant -i ${device} -c ${config_file}"
+cmd="wpa_supplicant -i ${device} -c ${WPA_SUPPLICANT_CONF_DIR}/${device}.conf"
if device_is_wireless ${device}; then
cmd="${cmd} -Dwext"