From 1bc19d3e99963face1f683d2f455a2274ab18f7e Mon Sep 17 00:00:00 2001 From: Rick Sommerville Date: Wed, 9 Jun 2021 17:34:45 -0400 Subject: [PATCH] WIFI-2604 wlan-ap-factory-reset.sh calls DigiCert Signed-off-by: Rick Sommerville --- .../openwrt/rootfs/common/etc/init.d/opensync | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/feeds/wlan-ap/opensync/src/platform/openwrt/rootfs/common/etc/init.d/opensync b/feeds/wlan-ap/opensync/src/platform/openwrt/rootfs/common/etc/init.d/opensync index e21419646..f4b9faea4 100755 --- a/feeds/wlan-ap/opensync/src/platform/openwrt/rootfs/common/etc/init.d/opensync +++ b/feeds/wlan-ap/opensync/src/platform/openwrt/rootfs/common/etc/init.d/opensync @@ -40,17 +40,20 @@ start_service() { echo "Checking Redirector" redirector=$(uci get system.tip.redirector) if [ -z "$redirector" ]; then - [[ -f /usr/opensync/certs/redirector.txt ]] && redirector=$(cat /usr/opensync/certs/redirector.txt | tr -d '\r\n') - if [ -z "$redirector" ]; then - logger -t opensync "Contacting DigiCert for redirector address" - wlan_ap_redirector.sh + [[ -f /usr/opensync/certs/redirector.txt ]] && saved_redirector=$(cat /usr/opensync/certs/redirector.txt | tr -d '\r\n') + logger -t opensync "Contacting DigiCert for redirector address" + wlan_ap_redirector.sh + new_redirector=$(uci get system.tip.redirector) + if [ -z "$new_redirector" && -n "$saved_redirector" ]; then + logger -t opensync "No response from DigiCert, using saved redirector address ${saved_redirector}" + wlan_ap_redirector.sh ${saved_redirector} else - logger -t opensync "Restoring redirector ${redirector} after factory reset" - wlan_ap_redirector.sh ${redirector} + logger -t opensync "DigiCert returned redirector address ${new_redirector}" fi + else + logger -t opensync "Using existing redirector address ${redirector}" + [[ -f /usr/opensync/certs/redirector.txt ]] || echo "${redirector}" > /usr/opensync/certs/redirector.txt fi - [[ -f /usr/opensync/certs/redirector.txt ]] || echo "${redirector}" > /usr/opensync/certs/redirector.txt - echo "Starting OpenSync" procd_set_param command ${PROG} procd_close_instance