settings: Immediately apply wireless reg domain

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

diff --git a/src/functions/functions.settings b/src/functions/functions.settings
index a50042cc64150ecd8c501e951b7dace0b8ed38c8..b644a2c2c760e76bc4fb66ef55dae68f18312326 100644 (file)
--- a/src/functions/functions.settings
+++ b/src/functions/functions.settings
@@ -259,6 +259,30 @@ network_settings_write() {
        dns_generate_resolvconf
 }
 
+network_settings_set() {
+       # Save all settings first
+       settings_set $@ || return $?
+
+       # Process any settings that require immediate actin
+       while [ $# -gt 0 ]; do
+               case "${1}" in
+                       *=*)
+                               local key=$(cli_get_key ${1})
+                               local val=$(cli_get_val ${1})
+
+                               case "${key}" in
+                                       WIRELESS_REGULATORY_DOMAIN)
+                                               wireless_set_reg_domain "${val}"
+                                               ;;
+                               esac
+                               ;;
+               esac
+               shift
+       done
+
+       return ${EXIT_OK}
+}
+
 network_settings_print() {
        settings_print ${NETWORK_SETTINGS_FILE_PARAMS}
 }

diff --git a/src/network b/src/network
index 922ad66f113bf9e2ca05f5d6bf3b0e89952fae45..9c4d6d9f961d245bc5b0d86af9cea8ad2dc82154 100644 (file)
--- a/src/network
+++ b/src/network
@@ -45,7 +45,7 @@ cli_settings() {
        fi
 
        if [ -n "${1}" ]; then
-               settings_set $@
+               network_settings_set $@
                network_settings_write
        else
                network_settings_print