From 85c51fed1eaa237d5e9f34d2b0b6c58abfa9af75 Mon Sep 17 00:00:00 2001
From: Simon Long <simon@raspberrypi.com>
Date: Mon, 27 Jul 2020 15:47:15 +0100
Subject: [PATCH] Disable initial rfkill on all platforms when setting wireless
 country

---
 raspi-config | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/raspi-config b/raspi-config
index 2809968..b9aeaa9 100755
--- a/raspi-config
+++ b/raspi-config
@@ -558,7 +558,10 @@ do_wifi_country() {
         ASK_TO_REBOOT=1
     fi
     if hash rfkill 2> /dev/null; then
-        rfkill unblock wifi
+      rfkill unblock wifi
+      for filename in /var/lib/systemd/rfkill/*:wlan ; do
+        echo 0 > $filename
+      done
     fi
     if [ "$INTERACTIVE" = True ]; then
         whiptail --msgbox "Wireless LAN country set to $COUNTRY" 20 60 1