wpa_supplicant: Move config header generation into own function

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

diff --git a/src/functions/functions.wireless-networks b/src/functions/functions.wireless-networks
index bba894ee5c585a8347ad0fb8ef9fe92a27660511..b3db4859287bc395285855120ee6eda83aeabba6 100644 (file)
--- a/src/functions/functions.wireless-networks
+++ b/src/functions/functions.wireless-networks
@@ -344,16 +344,8 @@ wireless_networks_write_wpa_supplicant_configuration() {
        local country="$(wireless_get_reg_domain)"
 
        (
-               config_header "WPA supplicant configuration file"
-
-               # Set control socket directory.
-               print "ctrl_interface=${WPA_SUPPLICANT_SOCKET_DIR}"
-
-               # Honour country
-               if isset country; then
-                       print "country=${country}"
-                       print
-               fi
+               # Write a config header
+               wpa_supplicant_config_header
 
                wireless_networks_to_wpa_supplicant
        ) > ${file}

diff --git a/src/functions/functions.wpa_supplicant b/src/functions/functions.wpa_supplicant
index ee5b96414073db84ae0223b1456cd8861bb69383..bc82a40ce775c42f64a6dd53040b91407d98278e 100644 (file)
--- a/src/functions/functions.wpa_supplicant
+++ b/src/functions/functions.wpa_supplicant
@@ -21,6 +21,20 @@
 
 WPA_SUPPLICANT_SOCKET_DIR="${RUN_DIR}/wpa_supplicant/ctrl"
 
+wpa_supplicant_config_header() {
+       config_header "WPA supplicant configuration file"
+
+       # Set control socket directory.
+       print "ctrl_interface=${WPA_SUPPLICANT_SOCKET_DIR}"
+
+       # Honour country
+       if isset country; then
+               print "country=${country}"
+       fi
+
+       print # end of header
+}
+
 wpa_supplicant_config_write() {
        local device="${1}"
        shift