zone: Make zone_config_{read,write} behave the same as zone_port_{read,write} do

diff --git a/src/functions/functions.zone b/src/functions/functions.zone
index 6373ec7cea1e39ca3f6ee25dd5b9c00253f4cc4c..4874f388dad7ac3584603316c32384fa4f724e21 100644 (file)
--- a/src/functions/functions.zone
+++ b/src/functions/functions.zone
@@ -1008,25 +1008,38 @@ function zone_settings_get() {
 }
 
 function zone_config_settings_read() {
 }
 
 function zone_config_settings_read() {

-       assert [ $# -gt 2 ]
+       assert [ $# -ge 2 ]

 
        local zone="${1}"
        local config="${2}"
        shift 2
 
 
        local zone="${1}"
        local config="${2}"
        shift 2
 

+       local args
+       if [ $# -eq 0 ] && [ -n "${HOOK_CONFIG_SETTINGS}" ]; then
+               list_append args ${HOOK_CONFIG_SETTINGS}
+       else
+               list_append args $@
+       fi
+

        local path="$(zone_dir "${zone}")/configs/${config}"
        local path="$(zone_dir "${zone}")/configs/${config}"

-       settings_read "${path}" "$@"
+       settings_read "${path}" ${args}

 }
 
 function zone_config_settings_write() {
 }
 
 function zone_config_settings_write() {

-       assert [ $# -gt 2 ]
+       assert [ $# -ge 2 ]

 
        local zone="${1}"
        local config="${2}"
        shift 2
 
 
        local zone="${1}"
        local config="${2}"
        shift 2
 

+       local args
+       if function_exists "hook_check_config_settings"; then
+               list_append args "--check=\"hook_check_config_settings\""
+       fi
+       list_append args ${HOOK_CONFIG_SETTINGS}
+

        local path="$(zone_dir "${zone}")/configs/${config}"
        local path="$(zone_dir "${zone}")/configs/${config}"

-       settings_write "${path}" "$@"
+       settings_write "${path}" ${args}

 }
 
 function zone_port_settings_read() {
 }
 
 function zone_port_settings_read() {