base-files: fix uci led oneshot/timer trigger

[oweals/openwrt.git] / package / base-files / files / lib / functions / uci-defaults.sh

diff --git a/package/base-files/files/lib/functions/uci-defaults.sh b/package/base-files/files/lib/functions/uci-defaults.sh
index 07e42c64912419357af2bacb9ded583e3f28a2b9..5ca14df1ad24244a3b3fd2f60317e59815454a4c 100755 (executable)
--- a/package/base-files/files/lib/functions/uci-defaults.sh
+++ b/package/base-files/files/lib/functions/uci-defaults.sh
@@ -319,6 +319,7 @@ ucidef_add_atm_bridge() {
        local vci="$2"
        local encaps="$3"
        local payload="$4"
+       local nameprefix="$5"
 
        json_select_object dsl
                json_select_object atmbridge
@@ -326,6 +327,7 @@ ucidef_add_atm_bridge() {
                        json_add_int vci "$vci"
                        json_add_string encaps "$encaps"
                        json_add_string payload "$payload"
+                       json_add_string nameprefix "$nameprefix"
                json_select ..
        json_select ..
 }
@@ -358,6 +360,10 @@ ucidef_add_vdsl_modem() {
        json_select ..
 }
 
+ucidef_set_led_ataport() {
+       _ucidef_set_led_trigger "$1" "$2" "$3" ata"$4"
+}
+
 _ucidef_set_led_common() {
        local cfg="led_$1"
        local name="$2"
@@ -435,8 +441,8 @@ ucidef_set_led_rssi() {
        local iface="$4"
        local minq="$5"
        local maxq="$6"
-       local offset="$7"
-       local factor="$8"
+       local offset="${7:-0}"
+       local factor="${8:-1}"
 
        _ucidef_set_led_common "$1" "$2" "$3"
 
@@ -475,6 +481,7 @@ _ucidef_set_led_timer() {
 
        _ucidef_set_led_common "$1" "$2" "$3"
 
+       json_add_string type "$trigger_name"
        json_add_string trigger "$trigger_name"
        json_add_int delayon "$delayon"
        json_add_int delayoff "$delayoff"
@@ -510,6 +517,10 @@ ucidef_set_led_usbdev() {
        json_select ..
 }
 
+ucidef_set_led_usbhost() {
+       _ucidef_set_led_trigger "$1" "$2" "$3" usb-host
+}
+
 ucidef_set_led_usbport() {
        local obj="$1"
        local name="$2"