From 474ceaabdec55ea8bd83ab3374c42ab7c106f8bd Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 17 Aug 2017 21:42:50 +0000 Subject: [PATCH] wpa_supplicant: Rename zone variable to device Since we are using this for ports now, too, the variable should have a generic name and the zone check must be removed Signed-off-by: Michael Tremer --- src/helpers/wpa_supplicant | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/helpers/wpa_supplicant b/src/helpers/wpa_supplicant index e0465d0f..69ee0ee5 100644 --- a/src/helpers/wpa_supplicant +++ b/src/helpers/wpa_supplicant @@ -24,18 +24,17 @@ # Read network settings network_settings_read -zone="${1}" -assert isset zone -assert zone_exists ${zone} +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" +config_file="$(wpa_supplicant_config_dir ${device})/wpa_supplicant.conf" -cmd="wpa_supplicant -i ${zone} -c ${config_file}" +cmd="wpa_supplicant -i ${device} -c ${config_file}" -if device_is_wireless ${zone}; then +if device_is_wireless ${device}; then cmd="${cmd} -Dwext" else cmd="${cmd} -Dwired" -- 2.39.2