procd: rename procd_add_network_trigger

[openwrt/openwrt.git] / package / system / procd / files / procd.sh

diff --git a/package/system/procd/files/procd.sh b/package/system/procd/files/procd.sh
index bee32938377afb171b5375e6c9e8ca9eec6939ee..67924a27491e062dc75375c9fdc52b2007e86dc3 100644 (file)
--- a/package/system/procd/files/procd.sh
+++ b/package/system/procd/files/procd.sh
@@ -131,6 +131,11 @@ _procd_set_param() {
                command|netdev|file|respawn|watch)
                        _procd_add_array "$type" "$@"
                ;;
+               error)
+                       json_add_array "$type"
+                       json_add_string "" "$@"
+                       json_close_array
+               ;;
                nice)
                        json_add_int "$type" "$1"
                ;;
@@ -159,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})
 
@@ -193,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
 }
 
@@ -207,8 +215,13 @@ _procd_add_validation() {
 
 _procd_append_param() {
        local type="$1"; shift
+       local _json_no_warning=1
 
        json_select "$type"
+       [ $? = 0 ] || {
+               _procd_set_param "$type" "$@"
+               return
+       }
        case "$type" in
                env|data|limits)
                        _procd_add_table_data "$@"
@@ -216,6 +229,9 @@ _procd_append_param() {
                command|netdev|file|respawn|watch)
                        _procd_add_array_data "$@"
                ;;
+               error)
+                       json_add_string "" "$@"
+               ;;
        esac
        json_select ..
 }
@@ -267,9 +283,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 \