From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 19 Aug 2017 09:33:30 +0000 (+0000)
Subject: Forgot to move one line
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b7ab3b4f20afd9a3d29011ed8141eb4f41f167d1;p=people%2Fjschlag%2Fnetwork.git

Forgot to move one line

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/functions/functions.wireless-networks b/src/functions/functions.wireless-networks
index b3db485..d84bd26 100644
--- a/src/functions/functions.wireless-networks
+++ b/src/functions/functions.wireless-networks
@@ -341,8 +341,6 @@ wireless_networks_write_wpa_supplicant_configuration() {
 	# Ensure we can write the file
 	make_parent_directory "${file}"
 
-	local country="$(wireless_get_reg_domain)"
-
 	(
 		# Write a config header
 		wpa_supplicant_config_header
diff --git a/src/functions/functions.wpa_supplicant b/src/functions/functions.wpa_supplicant
index bc82a40..0da38cc 100644
--- a/src/functions/functions.wpa_supplicant
+++ b/src/functions/functions.wpa_supplicant
@@ -28,6 +28,7 @@ wpa_supplicant_config_header() {
 	print "ctrl_interface=${WPA_SUPPLICANT_SOCKET_DIR}"
 
 	# Honour country
+	local country="$(wireless_get_reg_domain)"
 	if isset country; then
 		print "country=${country}"
 	fi