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 <jow@openwrt.org> SVN-Revision: 47867
2015-12-11 15:26:06 +00:00
parent b0b8293b7e
commit 67e1c87012
40 changed files with 548 additions and 893 deletions
--- 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

--- 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
--- 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
--- 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
--- 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

--- 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
--- 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

--- 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

--- 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

--- 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
--- 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)"
--- 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
--- 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
--- 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)
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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

--- 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

--- 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

--- 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
--- 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"
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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

--- 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)
--- 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
--- 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() {
--- 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()
--- 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

--- 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"
--- 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