procd: add a shell helper function to emit a config.change event

[openwrt/svn-archive/archive.git] / package / system / procd / files / procd.sh

diff --git a/package/system/procd/files/procd.sh b/package/system/procd/files/procd.sh
index 228652db97e3f1d5a0fb3de6524d3110516da0d7..1b19ba93f673963410c99e80d49f0c8c494cfcea 100644 (file)
--- a/package/system/procd/files/procd.sh
+++ b/package/system/procd/files/procd.sh
@@ -164,7 +164,7 @@ _procd_add_interface_trigger() {
        json_close_array
 }
 
-_procd_add_network_trigger() {
+_procd_add_reload_interface_trigger() {
        local script=$(readlink "$initscript")
        local name=$(basename ${script:-$initscript})
 
@@ -198,9 +198,12 @@ _procd_add_config_trigger() {
 _procd_add_reload_trigger() {
        local script=$(readlink "$initscript")
        local name=$(basename ${script:-$initscript})
+       local file
 
        _procd_open_trigger
-       _procd_add_config_trigger "config.change" $1 /etc/init.d/$name reload
+       for file in "$@"; do
+               _procd_add_config_trigger "config.change" "$file" /etc/init.d/$name reload
+       done
        _procd_close_trigger
 }
 
@@ -261,14 +264,38 @@ _procd_kill() {
        _procd_ubus_call delete
 }
 
+procd_open_data() {
+       local name="$1"
+       json_set_namespace procd __procd_old_cb
+       json_add_object data
+}
+
+procd_close_data() {
+       json_close_object
+       json_set_namespace $__procd_old_cb
+}
+
+_procd_set_config_changed() {
+       local package="$1"
+
+       json_init
+       json_add_string type config.change
+       json_add_object data
+       json_add_string package "$package"
+       json_close_object
+
+       ubus call service event "$(json_dump)"
+}
+
 uci_validate_section()
 {
        local _package="$1"
        local _type="$2"
        local _name="$3"
+       local _result
        local _error
        shift; shift; shift
-       local _result=`/sbin/validate_data "$_package" "$_type" "$_name" "$@" 2> /dev/null`
+       _result=`/sbin/validate_data "$_package" "$_type" "$_name" "$@" 2> /dev/null`
        _error=$?
        eval "$_result"
        [ "$_error" = "0" ] || `/sbin/validate_data "$_package" "$_type" "$_name" "$@" 1> /dev/null`
@@ -280,9 +307,10 @@ _procd_wrapper \
        procd_close_service \
        procd_add_instance \
        procd_add_config_trigger \
-       procd_add_reload_trigger \
        procd_add_interface_trigger \
-       procd_add_network_trigger \
+       procd_add_reload_trigger \
+       procd_add_reload_interface_trigger \
+       procd_add_interface_reload \
        procd_open_trigger \
        procd_close_trigger \
        procd_open_instance \
@@ -292,4 +320,5 @@ _procd_wrapper \
        procd_set_param \
        procd_append_param \
        procd_add_validation \
+       procd_set_config_changed \
        procd_kill