From e5da5f89cfc306336a82f91fdba2ad77c4e10c47 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Mon, 19 Jun 2017 19:42:18 +0100 Subject: [PATCH] Don't read from file when creating hotspot --- src/freedombone-wifi | 56 +++++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/src/freedombone-wifi b/src/freedombone-wifi index f6d9170a..6807c766 100755 --- a/src/freedombone-wifi +++ b/src/freedombone-wifi @@ -165,34 +165,36 @@ if [ ${WIFI_DISABLE} ]; then exit 0 fi -if [ -f ${WIFI_NETWORKS_FILE} ]; then - wifi_established= - wifi_retry_ctr=0 - while [ ! $wifi_established ]; do - if [ ${wifi_retry_ctr} -gt 0 ]; then - wpa_action ${WIFI_INTERFACE} stop - wpa_cli -i ${WIFI_INTERFACE} terminate +if [[ ${WIFI_HOTSPOT} == 'no' ]]; then + if [ -f ${WIFI_NETWORKS_FILE} ]; then + wifi_established= + wifi_retry_ctr=0 + while [ ! $wifi_established ]; do + if [ ${wifi_retry_ctr} -gt 0 ]; then + wpa_action ${WIFI_INTERFACE} stop + wpa_cli -i ${WIFI_INTERFACE} terminate + fi + networks_from_file + # allow some time for a connection to be established + sleep 5 + # has it worked? + if [[ $(wifi_is_running) != "0" ]]; then + wifi_established=1 + break + fi + # has the limit of retries been reached? + wifi_retry_ctr=$((wifi_retry_ctr+1)) + if [ ${wifi_retry_ctr} -ge ${WIFI_MAX_RETRIES} ]; then + break + fi + done + if [ $wifi_established ]; then + wpa_cli status + exit 0 + else + echo $'Wifi could not be started' + exit 4 fi - networks_from_file - # allow some time for a connection to be established - sleep 5 - # has it worked? - if [[ $(wifi_is_running) != "0" ]]; then - wifi_established=1 - break - fi - # has the limit of retries been reached? - wifi_retry_ctr=$((wifi_retry_ctr+1)) - if [ ${wifi_retry_ctr} -ge ${WIFI_MAX_RETRIES} ]; then - break - fi - done - if [ $wifi_established ]; then - wpa_cli status - exit 0 - else - echo $'Wifi could not be started' - exit 4 fi fi