From e7d51c2d7a79bfb76d5c1919b2731e24b9d68e5e Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 24 Aug 2021 12:08:57 -0400 Subject: [PATCH 1/3] iiab-firmware-warn.sh: Turn off warning tip, if wifi_hotspot_capacity_rpi_fix changed --- roles/firmware/templates/iiab-firmware-warn.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/roles/firmware/templates/iiab-firmware-warn.sh b/roles/firmware/templates/iiab-firmware-warn.sh index 5b1ba00df..83d6cd9b6 100644 --- a/roles/firmware/templates/iiab-firmware-warn.sh +++ b/roles/firmware/templates/iiab-firmware-warn.sh @@ -2,5 +2,9 @@ if [ -f /.fw_replaced ]; then echo -e "\n \033[31;5mWiFi Firmware has been replaced, per iiab/iiab#823.\033[0m" - echo -e " \033[31;5mReboot is required to activate.\033[0m\n" + if grep -q '^wifi_hotspot_capacity_rpi_fix:\s\+[fF]alse\b' /etc/iiab/local_vars.yml ; then + echo -e " \033[31;5mYou can delete /.fw_replaced if you want these warnings to stop.\033[0m\n" + else + echo -e " \033[31;5mReboot is required to activate.\033[0m\n" + fi fi From 8d70a2decf78ad0eda2e3359bf64943f98485dbc Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 24 Aug 2021 12:14:06 -0400 Subject: [PATCH 2/3] iiab-firmware-warn.sh: Explain 'sudo rm /.fw_replaced' --- roles/firmware/templates/iiab-firmware-warn.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/firmware/templates/iiab-firmware-warn.sh b/roles/firmware/templates/iiab-firmware-warn.sh index 83d6cd9b6..a5eddfd1e 100644 --- a/roles/firmware/templates/iiab-firmware-warn.sh +++ b/roles/firmware/templates/iiab-firmware-warn.sh @@ -3,7 +3,7 @@ if [ -f /.fw_replaced ]; then echo -e "\n \033[31;5mWiFi Firmware has been replaced, per iiab/iiab#823.\033[0m" if grep -q '^wifi_hotspot_capacity_rpi_fix:\s\+[fF]alse\b' /etc/iiab/local_vars.yml ; then - echo -e " \033[31;5mYou can delete /.fw_replaced if you want these warnings to stop.\033[0m\n" + echo -e " \033[31;5mRun 'sudo rm /.fw_replaced' if you want these warnings to stop.\033[0m\n" else echo -e " \033[31;5mReboot is required to activate.\033[0m\n" fi From 79ed242bdfc1ebf252d4f3c95b873fe92882a6a3 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 24 Aug 2021 15:22:08 -0400 Subject: [PATCH 3/3] iiab-check-firmware & iiab-firmware-warn.sh colors more readable --- roles/firmware/templates/iiab-check-firmware | 6 +++--- roles/firmware/templates/iiab-firmware-warn.sh | 8 +++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/roles/firmware/templates/iiab-check-firmware b/roles/firmware/templates/iiab-check-firmware index 94c690314..cd480692a 100644 --- a/roles/firmware/templates/iiab-check-firmware +++ b/roles/firmware/templates/iiab-check-firmware @@ -50,13 +50,13 @@ if ! $(diff -q /lib/firmware/brcm/brcmfmac43430-sdio.clm_blob.iiab /lib/firmware fi if [ "$WARN" = "1" ]; then - echo -e "\n \033[31;5mWiFi Firmware has been replaced, per iiab/iiab#823.\033[0m" - echo -e " \033[31;5mReboot is required to activate.\033[0m\n" + echo -e "\n \e[41;1mWiFi Firmware has been replaced, per iiab/iiab#823.\e[0m" + echo -e " \e[41;1mReboot is required to activate.\e[0m\n" touch /.fw_replaced #echo "rebooting..." #reboot else - echo -e " WiFi Firmware check \033[32;5mPASSED\033[0m, per iiab/iiab#823." + echo -e " WiFi Firmware check \e[42;1mPASSED\e[0m, per iiab/iiab#823." # Or \e[92m for green on black echo -e " (Assuming you've rebooted since it was replaced!)\n" if [ -f /.fw_replaced ]; then rm /.fw_replaced diff --git a/roles/firmware/templates/iiab-firmware-warn.sh b/roles/firmware/templates/iiab-firmware-warn.sh index a5eddfd1e..55120ffbd 100644 --- a/roles/firmware/templates/iiab-firmware-warn.sh +++ b/roles/firmware/templates/iiab-firmware-warn.sh @@ -1,10 +1,12 @@ #!/bin/bash if [ -f /.fw_replaced ]; then - echo -e "\n \033[31;5mWiFi Firmware has been replaced, per iiab/iiab#823.\033[0m" + echo -e "\n \e[41;1mWiFi Firmware has been replaced, per iiab/iiab#823.\e[0m" if grep -q '^wifi_hotspot_capacity_rpi_fix:\s\+[fF]alse\b' /etc/iiab/local_vars.yml ; then - echo -e " \033[31;5mRun 'sudo rm /.fw_replaced' if you want these warnings to stop.\033[0m\n" + echo -e " \e[100;1mIf you want these warnings to stop, run:\e[0m" + echo + echo -e " \e[100;1msudo rm /.fw_replaced\e[0m\n" else - echo -e " \033[31;5mReboot is required to activate.\033[0m\n" + echo -e " \e[41;1mReboot is required to activate.\e[0m\n" fi fi