No functional changes
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
+# Dummy functions being overlayed by hooks
+hook_check_settings() {
+ :
+}
+
+hook_check_config_settings() {
+ :
+}
+
+hook_check_port_settings() {
+ :
+}
+
# Sets all settings in HOOK_SETTINGS to their DEFAULT_* values
hook_set_defaults() {
local setting
# Sets all settings in HOOK_SETTINGS to their DEFAULT_* values
hook_set_defaults() {
local setting
port_settings_write() {
local port="${1}"
assert isset port
port_settings_write() {
local port="${1}"
assert isset port
- shift
-
- local args
- if function_exists "hook_check_settings"; then
- list_append args "--check=\"hook_check_settings\""
- fi
- list_append args HOOK ${HOOK_SETTINGS[*]}
- settings_write "$(port_file "${port}")" ${args}
+ settings_write "$(port_file "${port}")" \
+ --check="hook_check_settings" HOOK ${HOOK_SETTINGS[*]}
local zone="${1}"
assert isset zone
local zone="${1}"
assert isset zone
- local args
- if function_exists "hook_check_settings"; then
- list_append args "--check=\"hook_check_settings\""
- fi
- list_append args HOOK ${HOOK_SETTINGS[*]}
-
- settings_write "${NETWORK_ZONES_DIR}/${zone}/settings" ${args}
+ settings_write "${NETWORK_ZONES_DIR}/${zone}/settings" \
+ --check="hook_check_settings" HOOK ${HOOK_SETTINGS[*]}
}
zone_config_settings_write() {
}
zone_config_settings_write() {
local zone="${1}"
local hook="${2}"
local zone="${1}"
local hook="${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="${NETWORK_ZONES_DIR}/${zone}/configs/${hook}.${id}"
local path="${NETWORK_ZONES_DIR}/${zone}/configs/${hook}.${id}"
- settings_write "${path}" ${args}
+ settings_write "${path}" \
+ --check="hook_check_config_settings" ${HOOK_CONFIG_SETTINGS[*]}
}
zone_config_settings_destroy() {
}
zone_config_settings_destroy() {
}
zone_port_settings_write() {
}
zone_port_settings_write() {
local zone="${1}"
local port="${2}"
local zone="${1}"
local port="${2}"
- shift 2
-
- local args
- if function_exists "hook_check_port_settings"; then
- list_append args "--check=\"hook_check_port_settings\""
- fi
- list_append args ${HOOK_PORT_SETTINGS}
local path="${NETWORK_ZONES_DIR}/${zone}/ports/${port}"
local path="${NETWORK_ZONES_DIR}/${zone}/ports/${port}"
- settings_write "${path}" ${args}
+ settings_write "${path}" \
+ --check="hook_check_port_settings" ${HOOK_PORT_SETTINGS[*]}
}
zone_port_settings_remove() {
}
zone_port_settings_remove() {