From 67e1c8701215724dcee9fabcbd7a397ea76e1a9d Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Fri, 11 Dec 2015 15:26:06 +0000 Subject: [PATCH] all: drop old uci-defaults.sh Replace former uci-defaults.sh implementation with the uci-defaults-new.sh one and update all users accordingly. Signed-off-by: Jo-Philipp Wich SVN-Revision: 47867 --- .../files/lib/functions/uci-defaults-new.sh | 576 ------------- .../files/lib/functions/uci-defaults.sh | 807 +++++++++++------- .../ar7/base-files/etc/board.d/02_network | 2 +- .../ar71xx/base-files/etc/board.d/01_leds | 2 +- .../ar71xx/base-files/etc/board.d/02_network | 2 +- .../base-files/etc/board.d/03_gpio_switches | 2 +- .../arc770/base-files/etc/board.d/02_network | 2 +- .../at91/base-files/etc/board.d/02_network | 2 +- .../ath25/base-files/etc/board.d/01_leds | 2 +- .../ath25/base-files/etc/board.d/02_network | 2 +- .../bcm53xx/base-files/etc/board.d/02_network | 2 +- .../base-files/etc/board.d/02_network | 2 +- .../brcm47xx/base-files/etc/board.d/01_detect | 2 +- .../brcm63xx/base-files/etc/board.d/01_leds | 2 +- .../base-files/etc/board.d/02_network | 2 +- .../imx6/base-files/etc/board.d/02_network | 2 +- .../ipq806x/base-files/etc/board.d/01_leds | 2 +- .../ipq806x/base-files/etc/board.d/02_network | 2 +- .../kirkwood/base-files/etc/board.d/01_leds | 2 +- .../base-files/etc/board.d/02_network | 2 +- .../lantiq/base-files/etc/board.d/01_leds | 2 +- .../lantiq/base-files/etc/board.d/02_network | 2 +- .../malta/base-files/etc/board.d/00_model | 2 +- .../malta/base-files/etc/board.d/02_network | 2 +- .../mcs814x/base-files/etc/board.d/01_leds | 2 +- .../mcs814x/base-files/etc/board.d/02_network | 2 +- .../mpc85xx/base-files/etc/board.d/02_network | 2 +- .../mvebu/base-files/etc/board.d/01_leds | 2 +- .../mvebu/base-files/etc/board.d/02_network | 2 +- .../mxs/base-files/etc/board.d/02_network | 2 +- .../base-files/etc/board.d/02_network | 2 +- .../octeon/base-files/etc/board.d/01_network | 2 +- .../orion/base-files/etc/board.d/02_network | 2 +- .../oxnas/base-files/etc/board.d/01_leds | 2 +- .../oxnas/base-files/etc/board.d/02_network | 2 +- .../ramips/base-files/etc/board.d/01_leds | 2 +- .../ramips/base-files/etc/board.d/02_network | 2 +- .../realview/base-files/etc/board.d/00_model | 2 +- .../base-files/etc/board.d/02_network | 2 +- .../sunxi/base-files/etc/board.d/02_network | 2 +- 40 files changed, 557 insertions(+), 902 deletions(-) delete mode 100755 package/base-files/files/lib/functions/uci-defaults-new.sh mode change 100644 => 100755 package/base-files/files/lib/functions/uci-defaults.sh diff --git a/package/base-files/files/lib/functions/uci-defaults-new.sh b/package/base-files/files/lib/functions/uci-defaults-new.sh deleted file mode 100755 index de3f180cbb..0000000000 --- a/package/base-files/files/lib/functions/uci-defaults-new.sh +++ /dev/null @@ -1,576 +0,0 @@ -#!/bin/ash - -CFG=/etc/board.json - -. /lib/functions.sh -. /usr/share/libubox/jshn.sh - -json_select_array() { - local _json_no_warning=1 - - json_select "$1" - [ $? = 0 ] && return - - json_add_array "$1" - json_close_array - - json_select "$1" -} - -json_select_object() { - local _json_no_warning=1 - - json_select "$1" - [ $? = 0 ] && return - - json_add_object "$1" - json_close_object - - json_select "$1" -} - -_ucidef_set_interface() { - local name="$1" - local iface="$2" - local proto="$3" - - json_select_object "$name" - json_add_string ifname "$iface" - - if ! json_is_a protocol string; then - case "$proto" in - static|dhcp|none|pppoe) : ;; - *) - case "$name" in - lan) proto="static" ;; - wan) proto="dhcp" ;; - *) proto="none" ;; - esac - ;; - esac - - json_add_string protocol "$proto" - fi - - json_select .. -} - -ucidef_set_board_id() { - json_select_object model - json_add_string id "$1" - json_select .. -} - -ucidef_set_model_name() { - json_select_object model - json_add_string name "$1" - json_select .. -} - -ucidef_set_interface_lan() { - json_select_object network - _ucidef_set_interface lan "$@" - json_select .. -} - -ucidef_set_interface_wan() { - json_select_object network - _ucidef_set_interface wan "$@" - json_select .. -} - -ucidef_set_interfaces_lan_wan() { - local lan_if="$1" - local wan_if="$2" - - json_select_object network - _ucidef_set_interface lan "$lan_if" - _ucidef_set_interface wan "$wan_if" - json_select .. -} - -_ucidef_add_switch_port() { - # inherited: $num $device $need_tag $role $index $prev_role - # inherited: $n_cpu $n_ports $n_vlan $cpu0 $cpu1 $cpu2 $cpu3 $cpu4 $cpu5 - - n_ports=$((n_ports + 1)) - - json_select_array ports - json_add_object - json_add_int num "$num" - [ -n "$device" ] && json_add_string device "$device" - [ -n "$need_tag" ] && json_add_boolean need_tag "$need_tag" - [ -n "$role" ] && json_add_string role "$role" - [ -n "$index" ] && json_add_int index "$index" - json_close_object - json_select .. - - # record pointer to cpu entry for lookup in _ucidef_finish_switch_roles() - [ -n "$device" ] && { - export "cpu$n_cpu=$n_ports" - n_cpu=$((n_cpu + 1)) - } - - # create/append object to role list - [ -n "$role" ] && { - json_select_array roles - - if [ "$role" != "$prev_role" ]; then - json_add_object - json_add_string role "$role" - json_add_string ports "$num" - json_close_object - - prev_role="$role" - n_vlan=$((n_vlan + 1)) - else - json_select_object "$n_vlan" - json_get_var port ports - json_add_string ports "$port $num" - json_select .. - fi - - json_select .. - } -} - -_ucidef_finish_switch_roles() { - # inherited: $name $n_cpu $n_vlan $cpu0 $cpu1 $cpu2 $cpu3 $cpu4 $cpu5 - local index role roles num device need_tag port ports - - json_select switch - json_select "$name" - json_get_keys roles roles - json_select .. - json_select .. - - for index in $roles; do - eval "port=\$cpu$(((index - 1) % n_cpu))" - - json_select switch - json_select "$name" - json_select ports - json_select "$port" - json_get_vars num device need_tag - json_select .. - json_select .. - - if [ $n_vlan -gt $n_cpu -o ${need_tag:-0} -eq 1 ]; then - num="${num}t" - device="${device}.${index}" - fi - - json_select roles - json_select "$index" - json_get_vars role ports - json_add_string ports "$ports $num" - json_add_string device "$device" - json_select .. - json_select .. - json_select .. - json_select .. - - json_select_object network - local devices - - json_select_object "$role" - # attach previous interfaces (for multi-switch devices) - json_get_var devices ifname - if ! list_contains devices "$device"; then - devices="${devices:+$devices }$device" - fi - json_select .. - - _ucidef_set_interface "$role" "$devices" - json_select .. - done -} - -ucidef_add_switch() { - local name="$1"; shift - local port num role device index need_tag prev_role - local cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 - local n_cpu=0 n_vlan=0 n_ports=0 - - json_select_object switch - json_select_object "$name" - json_add_boolean enable 1 - json_add_boolean reset 1 - - for port in "$@"; do - case "$port" in - [0-9]*@*) - num="${port%%@*}" - device="${port##*@}" - need_tag=0 - [ "${num%t}" != "$num" ] && { - num="${num%t}" - need_tag=1 - } - ;; - [0-9]*:*:[0-9]*) - num="${port%%:*}" - index="${port##*:}" - role="${port#[0-9]*:}"; role="${role%:*}" - ;; - [0-9]*:*) - num="${port%%:*}" - role="${port##*:}" - ;; - esac - - if [ -n "$num" ] && [ -n "$device$role" ]; then - _ucidef_add_switch_port - fi - - unset num device role index need_tag - done - json_select .. - json_select .. - - _ucidef_finish_switch_roles -} - -ucidef_add_switch_attr() { - local name="$1" - local key="$2" - local val="$3" - - json_select_object switch - json_select_object "$name" - - case "$val" in - true|false) [ "$val" != "true" ]; json_add_boolean "$key" $? ;; - [0-9]) json_add_int "$key" "$val" ;; - *) json_add_string "$key" "$val" ;; - esac - - json_select .. - json_select .. -} - -ucidef_add_switch_port_attr() { - local name="$1" - local port="$2" - local key="$3" - local val="$4" - local ports i num - - json_select_object switch - json_select_object "$name" - - json_get_keys ports ports - json_select_array ports - - for i in $ports; do - json_select "$i" - json_get_var num num - - if [ -n "$num" ] && [ $num -eq $port ]; then - json_select_object attr - - case "$val" in - true|false) [ "$val" != "true" ]; json_add_boolean "$key" $? ;; - [0-9]) json_add_int "$key" "$val" ;; - *) json_add_string "$key" "$val" ;; - esac - - json_select .. - fi - - json_select .. - done - - json_select .. - json_select .. - json_select .. -} - -ucidef_set_interface_macaddr() { - local network="$1" - local macaddr="$2" - - json_select_object network - - json_select "$network" - [ $? -eq 0 ] || { - json_select .. - return - } - - json_add_string macaddr "$macaddr" - json_select .. - - json_select .. -} - -ucidef_add_atm_bridge() { - local vpi="$1" - local vci="$2" - local encaps="$3" - local payload="$4" - - json_select_object dsl - json_select_object atmbridge - json_add_int vpi "$vpi" - json_add_int vci "$vci" - json_add_string encaps "$encaps" - json_add_string payload "$payload" - json_select .. - json_select .. -} - -ucidef_add_adsl_modem() { - local annex="$1" - local firmware="$2" - - json_select_object dsl - json_select_object modem - json_add_string type "adsl" - json_add_string annex "$annex" - json_add_string firmware "$firmware" - json_select .. - json_select .. -} - -ucidef_add_vdsl_modem() { - local annex="$1" - local firmware="$2" - local tone="$3" - local xfer_mode="$4" - - json_select_object dsl - json_select_object modem - json_add_string type "vdsl" - json_add_string annex "$annex" - json_add_string firmware "$firmware" - json_add_string tone "$tone" - json_add_string xfer_mode "$xfer_mode" - json_select .. - json_select .. -} - -ucidef_set_led_netdev() { - local cfg="led_$1" - local name="$2" - local sysfs="$3" - local dev="$4" - - json_select_object led - - json_select_object "$1" - json_add_string name "$name" - json_add_string type netdev - json_add_string sysfs "$sysfs" - json_add_string device "$dev" - json_select .. - - json_select .. -} - -ucidef_set_led_usbdev() { - local cfg="led_$1" - local name="$2" - local sysfs="$3" - local dev="$4" - - json_select_object led - - json_select_object "$1" - json_add_string name "$name" - json_add_string type usb - json_add_string sysfs "$sysfs" - json_add_string device "$dev" - json_select .. - - json_select .. -} - -ucidef_set_led_wlan() { - local cfg="led_$1" - local name="$2" - local sysfs="$3" - local trigger="$4" - - json_select_object led - - json_select_object "$1" - json_add_string name "$name" - json_add_string type trigger - json_add_string sysfs "$sysfs" - json_add_string trigger "$trigger" - json_select .. - - json_select .. -} - -ucidef_set_led_switch() { - local cfg="led_$1" - local name="$2" - local sysfs="$3" - local trigger="$4" - local port_mask="$5" - - json_select_object led - - json_select_object "$1" - json_add_string name "$name" - json_add_string type switch - json_add_string sysfs "$sysfs" - json_add_string trigger "$trigger" - json_add_string port_mask "$port_mask" - json_select .. - - json_select .. -} - -ucidef_set_led_default() { - local cfg="led_$1" - local name="$2" - local sysfs="$3" - local default="$4" - - json_select_object led - - json_select_object "$1" - json_add_string name "$name" - json_add_string sysfs "$sysfs" - json_add_string default "$default" - json_select .. - - json_select .. -} - -ucidef_set_led_gpio() { - local cfg="led_$1" - local name="$2" - local sysfs="$3" - local gpio="$4" - local inverted="$5" - - json_select_object led - - json_select_object "$1" - json_add_string type gpio - json_add_string name "$name" - json_add_string sysfs "$sysfs" - json_add_string trigger "$trigger" - json_add_int gpio "$gpio" - json_add_boolean inverted "$inverted" - json_select .. - - json_select .. -} - -ucidef_set_led_ide() { - local cfg="led_$1" - local name="$2" - local sysfs="$3" - - json_select_object led - - json_select_object "$1" - json_add_string name "$name" - json_add_string sysfs "$sysfs" - json_add_string trigger ide-disk - json_select .. - - json_select .. -} - -ucidef_set_led_timer() { - local cfg="led_$1" - local name="$2" - local sysfs="$3" - local delayon="$4" - local delayoff="$5" - - json_select_object led - - json_select_object "$1" - json_add_string type timer - json_add_string name "$name" - json_add_string sysfs "$sysfs" - json_add_int delayon "$delayon" - json_add_int delayoff "$delayoff" - json_select .. - - json_select .. -} - -ucidef_set_led_rssi() { - local cfg="led_$1" - local name="$2" - local sysfs="$3" - local iface="$4" - local minq="$5" - local maxq="$6" - local offset="$7" - local factor="$8" - - json_select_object led - - json_select_object "$1" - json_add_string type rssi - json_add_string name "$name" - json_add_string iface "$iface" - json_add_string sysfs "$sysfs" - json_add_string minq "$minq" - json_add_string maxq "$maxq" - json_add_string offset "$offset" - json_add_string factor "$factor" - json_select .. - - json_select .. -} - -ucidef_set_rssimon() { - local dev="$1" - local refresh="$2" - local threshold="$3" - - json_select_object rssimon - - json_select_object "$dev" - [ -n "$refresh" ] && json_add_int refresh "$refresh" - [ -n "$threshold" ] && json_add_int threshold "$threshold" - json_select .. - - json_select .. - -} - -ucidef_add_gpio_switch() { - local cfg="$1" - local name="$2" - local pin="$3" - local default="${4:-0}" - - json_select_object gpioswitch - json_select_object "$cfg" - json_add_string name "$name" - json_add_int pin "$pin" - json_add_int default "$default" - json_select .. - json_select .. -} - -board_config_update() { - json_init - [ -f ${CFG} ] && json_load "$(cat ${CFG})" - - # auto-initialize model id and name if applicable - if ! json_is_a model object; then - json_select_object model - [ -f "/tmp/sysinfo/board_name" ] && \ - json_add_string id "$(cat /tmp/sysinfo/board_name)" - [ -f "/tmp/sysinfo/model" ] && \ - json_add_string name "$(cat /tmp/sysinfo/model)" - json_select .. - fi -} - -board_config_flush() { - json_dump -i > /tmp/.board.json - mv /tmp/.board.json ${CFG} -} diff --git a/package/base-files/files/lib/functions/uci-defaults.sh b/package/base-files/files/lib/functions/uci-defaults.sh old mode 100644 new mode 100755 index 2658d439ac..de3f180cbb --- a/package/base-files/files/lib/functions/uci-defaults.sh +++ b/package/base-files/files/lib/functions/uci-defaults.sh @@ -1,345 +1,576 @@ -#!/bin/sh -# Copyright (C) 2011 OpenWrt.org +#!/bin/ash -UCIDEF_LEDS_CHANGED=0 -UCIDEF_GPIO_SWITCHES_CHANGED=0 +CFG=/etc/board.json -ucidef_set_led_netdev() { - local cfg="led_$1" - local name=$2 - local sysfs=$3 - local dev=$4 - - uci -q get system.$cfg && return 0 - - uci batch < /tmp/.board.json + mv /tmp/.board.json ${CFG} +} diff --git a/target/linux/ar7/base-files/etc/board.d/02_network b/target/linux/ar7/base-files/etc/board.d/02_network index 0d79f8e7d4..c1c2dc42fe 100755 --- a/target/linux/ar7/base-files/etc/board.d/02_network +++ b/target/linux/ar7/base-files/etc/board.d/02_network @@ -1,6 +1,6 @@ #!/bin/sh -. /lib/functions/uci-defaults-new.sh +. /lib/functions/uci-defaults.sh board_config_update diff --git a/target/linux/ar71xx/base-files/etc/board.d/01_leds b/target/linux/ar71xx/base-files/etc/board.d/01_leds index 892b56738d..33f83776a4 100755 --- a/target/linux/ar71xx/base-files/etc/board.d/01_leds +++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds @@ -3,7 +3,7 @@ # Copyright (C) 2011 OpenWrt.org # -. /lib/functions/uci-defaults-new.sh +. /lib/functions/uci-defaults.sh . /lib/ar71xx.sh board_config_update diff --git a/target/linux/ar71xx/base-files/etc/board.d/02_network b/target/linux/ar71xx/base-files/etc/board.d/02_network index 3dc1ec4422..0e77e933c3 100755 --- a/target/linux/ar71xx/base-files/etc/board.d/02_network +++ b/target/linux/ar71xx/base-files/etc/board.d/02_network @@ -4,7 +4,7 @@ # . /lib/functions/system.sh -. /lib/functions/uci-defaults-new.sh +. /lib/functions/uci-defaults.sh . /lib/ar71xx.sh board_config_update diff --git a/target/linux/ar71xx/base-files/etc/board.d/03_gpio_switches b/target/linux/ar71xx/base-files/etc/board.d/03_gpio_switches index 9a1be1a8fa..8abcfc0db0 100755 --- a/target/linux/ar71xx/base-files/etc/board.d/03_gpio_switches +++ b/target/linux/ar71xx/base-files/etc/board.d/03_gpio_switches @@ -3,7 +3,7 @@ # Copyright (C) 2015 OpenWrt.org # -. /lib/functions/uci-defaults-new.sh +. /lib/functions/uci-defaults.sh . /lib/ar71xx.sh board_config_update diff --git a/target/linux/arc770/base-files/etc/board.d/02_network b/target/linux/arc770/base-files/etc/board.d/02_network index cd5ad2d05b..dabc539fc8 100755 --- a/target/linux/arc770/base-files/etc/board.d/02_network +++ b/target/linux/arc770/base-files/etc/board.d/02_network @@ -4,7 +4,7 @@ # . /lib/arc.sh -. /lib/functions/uci-defaults-new.sh +. /lib/functions/uci-defaults.sh board_config_update diff --git a/target/linux/at91/base-files/etc/board.d/02_network b/target/linux/at91/base-files/etc/board.d/02_network index fc3e112f02..52709f6061 100755 --- a/target/linux/at91/base-files/etc/board.d/02_network +++ b/target/linux/at91/base-files/etc/board.d/02_network @@ -3,7 +3,7 @@ # Copyright (C) 2014-2015 OpenWrt.org # -. /lib/functions/uci-defaults-new.sh +. /lib/functions/uci-defaults.sh . /lib/at91.sh board_config_update diff --git a/target/linux/ath25/base-files/etc/board.d/01_leds b/target/linux/ath25/base-files/etc/board.d/01_leds index e28dcda23d..e6ab4a76b1 100755 --- a/target/linux/ath25/base-files/etc/board.d/01_leds +++ b/target/linux/ath25/base-files/etc/board.d/01_leds @@ -2,7 +2,7 @@ # Copyright 2012-2015 OpenWrt.org # -. /lib/functions/uci-defaults-new.sh +. /lib/functions/uci-defaults.sh board_config_update diff --git a/target/linux/ath25/base-files/etc/board.d/02_network b/target/linux/ath25/base-files/etc/board.d/02_network index b2781bf4cb..b2977f7b94 100755 --- a/target/linux/ath25/base-files/etc/board.d/02_network +++ b/target/linux/ath25/base-files/etc/board.d/02_network @@ -1,6 +1,6 @@ #!/bin/sh -. /lib/functions/uci-defaults-new.sh +. /lib/functions/uci-defaults.sh board_config_update diff --git a/target/linux/bcm53xx/base-files/etc/board.d/02_network b/target/linux/bcm53xx/base-files/etc/board.d/02_network index 4402861b04..c748e144cb 100755 --- a/target/linux/bcm53xx/base-files/etc/board.d/02_network +++ b/target/linux/bcm53xx/base-files/etc/board.d/02_network @@ -3,7 +3,7 @@ # Copyright (C) 2011 OpenWrt.org # -. /lib/functions/uci-defaults-new.sh +. /lib/functions/uci-defaults.sh board_config_update diff --git a/target/linux/brcm2708/base-files/etc/board.d/02_network b/target/linux/brcm2708/base-files/etc/board.d/02_network index a05c3d5956..c47e8f0e23 100755 --- a/target/linux/brcm2708/base-files/etc/board.d/02_network +++ b/target/linux/brcm2708/base-files/etc/board.d/02_network @@ -1,7 +1,7 @@ #!/bin/sh # Copyright (C) 2014-2015 OpenWrt.org -. /lib/functions/uci-defaults-new.sh +. /lib/functions/uci-defaults.sh . /lib/brcm2708.sh . /lib/functions.sh . /lib/functions/system.sh diff --git a/target/linux/brcm47xx/base-files/etc/board.d/01_detect b/target/linux/brcm47xx/base-files/etc/board.d/01_detect index 2623b57bce..841aafac35 100755 --- a/target/linux/brcm47xx/base-files/etc/board.d/01_detect +++ b/target/linux/brcm47xx/base-files/etc/board.d/01_detect @@ -2,7 +2,7 @@ # Copyright (C) 2006-2015 OpenWrt.org . /lib/functions/system.sh -. /lib/functions/uci-defaults-new.sh +. /lib/functions/uci-defaults.sh detect_by_vlanports() { local vlan0ports="$(nvram get vlan0ports)" diff --git a/target/linux/brcm63xx/base-files/etc/board.d/01_leds b/target/linux/brcm63xx/base-files/etc/board.d/01_leds index 4955efdf27..2697a56e8e 100755 --- a/target/linux/brcm63xx/base-files/etc/board.d/01_leds +++ b/target/linux/brcm63xx/base-files/etc/board.d/01_leds @@ -3,7 +3,7 @@ # Copyright (C) 2013-2015 OpenWrt.org # -. /lib/functions/uci-defaults-new.sh +. /lib/functions/uci-defaults.sh . /lib/brcm63xx.sh board_config_update diff --git a/target/linux/brcm63xx/base-files/etc/board.d/02_network b/target/linux/brcm63xx/base-files/etc/board.d/02_network index 2098d988a3..c01aba81b8 100755 --- a/target/linux/brcm63xx/base-files/etc/board.d/02_network +++ b/target/linux/brcm63xx/base-files/etc/board.d/02_network @@ -3,7 +3,7 @@ # Copyright (C) 2012-2015 OpenWrt.org # -. /lib/functions/uci-defaults-new.sh +. /lib/functions/uci-defaults.sh . /lib/brcm63xx.sh board_config_update diff --git a/target/linux/imx6/base-files/etc/board.d/02_network b/target/linux/imx6/base-files/etc/board.d/02_network index d4aac5acc5..cf11f62784 100755 --- a/target/linux/imx6/base-files/etc/board.d/02_network +++ b/target/linux/imx6/base-files/etc/board.d/02_network @@ -3,7 +3,7 @@ # Copyright (C) 2013-2015 OpenWrt.org # -. /lib/functions/uci-defaults-new.sh +. /lib/functions/uci-defaults.sh . /lib/imx6.sh board=$(imx6_board_name) diff --git a/target/linux/ipq806x/base-files/etc/board.d/01_leds b/target/linux/ipq806x/base-files/etc/board.d/01_leds index b2356c072a..07b5b06988 100755 --- a/target/linux/ipq806x/base-files/etc/board.d/01_leds +++ b/target/linux/ipq806x/base-files/etc/board.d/01_leds @@ -3,7 +3,7 @@ # Copyright (C) 2015 OpenWrt.org # -. /lib/functions/uci-defaults-new.sh +. /lib/functions/uci-defaults.sh . /lib/ipq806x.sh board_config_update diff --git a/target/linux/ipq806x/base-files/etc/board.d/02_network b/target/linux/ipq806x/base-files/etc/board.d/02_network index b0542302ac..1302a559f1 100755 --- a/target/linux/ipq806x/base-files/etc/board.d/02_network +++ b/target/linux/ipq806x/base-files/etc/board.d/02_network @@ -4,7 +4,7 @@ # Copyright (c) 2011-2015 OpenWrt.org # -. /lib/functions/uci-defaults-new.sh +. /lib/functions/uci-defaults.sh . /lib/ipq806x.sh board_config_update diff --git a/target/linux/kirkwood/base-files/etc/board.d/01_leds b/target/linux/kirkwood/base-files/etc/board.d/01_leds index 9e84d8bb20..ce1309966e 100755 --- a/target/linux/kirkwood/base-files/etc/board.d/01_leds +++ b/target/linux/kirkwood/base-files/etc/board.d/01_leds @@ -3,7 +3,7 @@ # Copyright (C) 2012-2015 OpenWrt.org # -. /lib/functions/uci-defaults-new.sh +. /lib/functions/uci-defaults.sh . /lib/kirkwood.sh board_config_update diff --git a/target/linux/kirkwood/base-files/etc/board.d/02_network b/target/linux/kirkwood/base-files/etc/board.d/02_network index 355418b229..bf966e1117 100755 --- a/target/linux/kirkwood/base-files/etc/board.d/02_network +++ b/target/linux/kirkwood/base-files/etc/board.d/02_network @@ -3,7 +3,7 @@ # Copyright (C) 2012-2015 OpenWrt.org # -. /lib/functions/uci-defaults-new.sh +. /lib/functions/uci-defaults.sh . /lib/kirkwood.sh board_config_update diff --git a/target/linux/lantiq/base-files/etc/board.d/01_leds b/target/linux/lantiq/base-files/etc/board.d/01_leds index 74d74c4462..b5801cac99 100755 --- a/target/linux/lantiq/base-files/etc/board.d/01_leds +++ b/target/linux/lantiq/base-files/etc/board.d/01_leds @@ -4,7 +4,7 @@ # based on ar71xx # -. /lib/functions/uci-defaults-new.sh +. /lib/functions/uci-defaults.sh . /lib/functions/lantiq.sh board_config_update diff --git a/target/linux/lantiq/base-files/etc/board.d/02_network b/target/linux/lantiq/base-files/etc/board.d/02_network index 08a143f0b1..8fc0835bdb 100755 --- a/target/linux/lantiq/base-files/etc/board.d/02_network +++ b/target/linux/lantiq/base-files/etc/board.d/02_network @@ -3,7 +3,7 @@ # Copyright (C) 2011-2015 OpenWrt.org # -. /lib/functions/uci-defaults-new.sh +. /lib/functions/uci-defaults.sh . /lib/functions/system.sh . /lib/functions/lantiq.sh diff --git a/target/linux/malta/base-files/etc/board.d/00_model b/target/linux/malta/base-files/etc/board.d/00_model index 54f4d9a7d0..7a834058f3 100755 --- a/target/linux/malta/base-files/etc/board.d/00_model +++ b/target/linux/malta/base-files/etc/board.d/00_model @@ -1,7 +1,7 @@ #!/bin/sh # Copyright (C) 2015 OpenWrt.org -. /lib/functions/uci-defaults-new.sh +. /lib/functions/uci-defaults.sh board_config_update diff --git a/target/linux/malta/base-files/etc/board.d/02_network b/target/linux/malta/base-files/etc/board.d/02_network index fc9056fa99..8f01108938 100755 --- a/target/linux/malta/base-files/etc/board.d/02_network +++ b/target/linux/malta/base-files/etc/board.d/02_network @@ -1,6 +1,6 @@ #!/bin/sh -. /lib/functions/uci-defaults-new.sh +. /lib/functions/uci-defaults.sh board_config_update diff --git a/target/linux/mcs814x/base-files/etc/board.d/01_leds b/target/linux/mcs814x/base-files/etc/board.d/01_leds index 3b1de4ae9b..efcf8093ae 100755 --- a/target/linux/mcs814x/base-files/etc/board.d/01_leds +++ b/target/linux/mcs814x/base-files/etc/board.d/01_leds @@ -3,7 +3,7 @@ # Copyright (C) 2012-2015 OpenWrt.org # -. /lib/functions/uci-defaults-new.sh +. /lib/functions/uci-defaults.sh . /lib/mcs814x.sh board_config_update diff --git a/target/linux/mcs814x/base-files/etc/board.d/02_network b/target/linux/mcs814x/base-files/etc/board.d/02_network index a447923f42..d3f2e653f8 100755 --- a/target/linux/mcs814x/base-files/etc/board.d/02_network +++ b/target/linux/mcs814x/base-files/etc/board.d/02_network @@ -3,7 +3,7 @@ # Copyright (C) 2015 OpenWrt.org # -. /lib/functions/uci-defaults-new.sh +. /lib/functions/uci-defaults.sh board_config_update ucidef_set_interface_lan "eth0" diff --git a/target/linux/mpc85xx/base-files/etc/board.d/02_network b/target/linux/mpc85xx/base-files/etc/board.d/02_network index ddb67a699a..4c7206c14a 100755 --- a/target/linux/mpc85xx/base-files/etc/board.d/02_network +++ b/target/linux/mpc85xx/base-files/etc/board.d/02_network @@ -1,7 +1,7 @@ #!/bin/sh # Copyright (C) 2014-2015 OpenWrt.org -. /lib/functions/uci-defaults-new.sh +. /lib/functions/uci-defaults.sh . /lib/mpc85xx.sh . /lib/functions.sh . /lib/functions/system.sh diff --git a/target/linux/mvebu/base-files/etc/board.d/01_leds b/target/linux/mvebu/base-files/etc/board.d/01_leds index eb245d85ae..71dd3476e6 100755 --- a/target/linux/mvebu/base-files/etc/board.d/01_leds +++ b/target/linux/mvebu/base-files/etc/board.d/01_leds @@ -3,7 +3,7 @@ # Copyright (C) 2014-2015 OpenWrt.org # -. /lib/functions/uci-defaults-new.sh +. /lib/functions/uci-defaults.sh . /lib/mvebu.sh board_config_update diff --git a/target/linux/mvebu/base-files/etc/board.d/02_network b/target/linux/mvebu/base-files/etc/board.d/02_network index ef30a2214d..289a4b0c01 100755 --- a/target/linux/mvebu/base-files/etc/board.d/02_network +++ b/target/linux/mvebu/base-files/etc/board.d/02_network @@ -3,7 +3,7 @@ # Copyright (C) 2014-2015 OpenWrt.org # -. /lib/functions/uci-defaults-new.sh +. /lib/functions/uci-defaults.sh . /lib/mvebu.sh board_config_update diff --git a/target/linux/mxs/base-files/etc/board.d/02_network b/target/linux/mxs/base-files/etc/board.d/02_network index 102839dba3..b31deb7cb6 100755 --- a/target/linux/mxs/base-files/etc/board.d/02_network +++ b/target/linux/mxs/base-files/etc/board.d/02_network @@ -1,7 +1,7 @@ #!/bin/sh # Copyright (C) 2013-2015 OpenWrt.org -. /lib/functions/uci-defaults-new.sh +. /lib/functions/uci-defaults.sh . /lib/mxs.sh board_config_update diff --git a/target/linux/netlogic/base-files/etc/board.d/02_network b/target/linux/netlogic/base-files/etc/board.d/02_network index e6acda67fb..fca8d9662a 100755 --- a/target/linux/netlogic/base-files/etc/board.d/02_network +++ b/target/linux/netlogic/base-files/etc/board.d/02_network @@ -3,7 +3,7 @@ # Copyright (C) 2014-2015 OpenWrt.org # -. /lib/functions/uci-defaults-new.sh +. /lib/functions/uci-defaults.sh . /lib/netlogic.sh board_config_update diff --git a/target/linux/octeon/base-files/etc/board.d/01_network b/target/linux/octeon/base-files/etc/board.d/01_network index f07bdf8ca6..3c1e843b6c 100755 --- a/target/linux/octeon/base-files/etc/board.d/01_network +++ b/target/linux/octeon/base-files/etc/board.d/01_network @@ -3,7 +3,7 @@ # Copyright (C) 2014-2015 OpenWrt.org # -. /lib/functions/uci-defaults-new.sh +. /lib/functions/uci-defaults.sh . /lib/functions/octeon.sh board_config_update diff --git a/target/linux/orion/base-files/etc/board.d/02_network b/target/linux/orion/base-files/etc/board.d/02_network index 96cd083c45..ab74bf3713 100755 --- a/target/linux/orion/base-files/etc/board.d/02_network +++ b/target/linux/orion/base-files/etc/board.d/02_network @@ -1,6 +1,6 @@ #!/bin/sh -. /lib/functions/uci-defaults-new.sh +. /lib/functions/uci-defaults.sh board_config_update diff --git a/target/linux/oxnas/base-files/etc/board.d/01_leds b/target/linux/oxnas/base-files/etc/board.d/01_leds index 17e37cd91c..52da945680 100755 --- a/target/linux/oxnas/base-files/etc/board.d/01_leds +++ b/target/linux/oxnas/base-files/etc/board.d/01_leds @@ -1,6 +1,6 @@ #!/bin/sh -. /lib/functions/uci-defaults-new.sh +. /lib/functions/uci-defaults.sh . /lib/oxnas.sh board=$(oxnas_board_name) diff --git a/target/linux/oxnas/base-files/etc/board.d/02_network b/target/linux/oxnas/base-files/etc/board.d/02_network index 3a1058402e..227cfba0a6 100755 --- a/target/linux/oxnas/base-files/etc/board.d/02_network +++ b/target/linux/oxnas/base-files/etc/board.d/02_network @@ -1,6 +1,6 @@ #!/bin/sh -. /lib/functions/uci-defaults-new.sh +. /lib/functions/uci-defaults.sh . /lib/functions/system.sh board_config_update diff --git a/target/linux/ramips/base-files/etc/board.d/01_leds b/target/linux/ramips/base-files/etc/board.d/01_leds index 40a524405d..c3a81a4513 100755 --- a/target/linux/ramips/base-files/etc/board.d/01_leds +++ b/target/linux/ramips/base-files/etc/board.d/01_leds @@ -1,6 +1,6 @@ #!/bin/sh -. /lib/functions/uci-defaults-new.sh +. /lib/functions/uci-defaults.sh . /lib/ramips.sh set_usb_led() { diff --git a/target/linux/ramips/base-files/etc/board.d/02_network b/target/linux/ramips/base-files/etc/board.d/02_network index dce6002e12..a55c9eb24f 100755 --- a/target/linux/ramips/base-files/etc/board.d/02_network +++ b/target/linux/ramips/base-files/etc/board.d/02_network @@ -2,7 +2,7 @@ . /lib/functions.sh . /lib/ramips.sh -. /lib/functions/uci-defaults-new.sh +. /lib/functions/uci-defaults.sh . /lib/functions/system.sh ramips_setup_rt3x5x_vlans() diff --git a/target/linux/realview/base-files/etc/board.d/00_model b/target/linux/realview/base-files/etc/board.d/00_model index b7dc5074cd..9318d8e9b1 100755 --- a/target/linux/realview/base-files/etc/board.d/00_model +++ b/target/linux/realview/base-files/etc/board.d/00_model @@ -1,7 +1,7 @@ #!/bin/sh # Copyright (C) 2015 OpenWrt.org -. /lib/functions/uci-defaults-new.sh +. /lib/functions/uci-defaults.sh board_config_update diff --git a/target/linux/realview/base-files/etc/board.d/02_network b/target/linux/realview/base-files/etc/board.d/02_network index 0ac93ac8e0..df7abe2e36 100755 --- a/target/linux/realview/base-files/etc/board.d/02_network +++ b/target/linux/realview/base-files/etc/board.d/02_network @@ -1,6 +1,6 @@ #!/bin/sh -. /lib/functions/uci-defaults-new.sh +. /lib/functions/uci-defaults.sh board_config_update ucidef_set_interface_lan "eth0" "dhcp" diff --git a/target/linux/sunxi/base-files/etc/board.d/02_network b/target/linux/sunxi/base-files/etc/board.d/02_network index 59af55c7a1..74fa2a0e6d 100755 --- a/target/linux/sunxi/base-files/etc/board.d/02_network +++ b/target/linux/sunxi/base-files/etc/board.d/02_network @@ -4,7 +4,7 @@ # . /lib/sunxi.sh -. /lib/functions/uci-defaults-new.sh +. /lib/functions/uci-defaults.sh board_config_update -- 2.30.2