From 67e1c8701215724dcee9fabcbd7a397ea76e1a9d Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Fri, 11 Dec 2015 15:26:06 +0000 Subject: 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 --- target/linux/ar7/base-files/etc/board.d/02_network | 2 +- target/linux/ar71xx/base-files/etc/board.d/01_leds | 2 +- target/linux/ar71xx/base-files/etc/board.d/02_network | 2 +- target/linux/ar71xx/base-files/etc/board.d/03_gpio_switches | 2 +- target/linux/arc770/base-files/etc/board.d/02_network | 2 +- target/linux/at91/base-files/etc/board.d/02_network | 2 +- target/linux/ath25/base-files/etc/board.d/01_leds | 2 +- target/linux/ath25/base-files/etc/board.d/02_network | 2 +- target/linux/bcm53xx/base-files/etc/board.d/02_network | 2 +- target/linux/brcm2708/base-files/etc/board.d/02_network | 2 +- target/linux/brcm47xx/base-files/etc/board.d/01_detect | 2 +- target/linux/brcm63xx/base-files/etc/board.d/01_leds | 2 +- target/linux/brcm63xx/base-files/etc/board.d/02_network | 2 +- target/linux/imx6/base-files/etc/board.d/02_network | 2 +- target/linux/ipq806x/base-files/etc/board.d/01_leds | 2 +- target/linux/ipq806x/base-files/etc/board.d/02_network | 2 +- target/linux/kirkwood/base-files/etc/board.d/01_leds | 2 +- target/linux/kirkwood/base-files/etc/board.d/02_network | 2 +- target/linux/lantiq/base-files/etc/board.d/01_leds | 2 +- target/linux/lantiq/base-files/etc/board.d/02_network | 2 +- target/linux/malta/base-files/etc/board.d/00_model | 2 +- target/linux/malta/base-files/etc/board.d/02_network | 2 +- target/linux/mcs814x/base-files/etc/board.d/01_leds | 2 +- target/linux/mcs814x/base-files/etc/board.d/02_network | 2 +- target/linux/mpc85xx/base-files/etc/board.d/02_network | 2 +- target/linux/mvebu/base-files/etc/board.d/01_leds | 2 +- target/linux/mvebu/base-files/etc/board.d/02_network | 2 +- target/linux/mxs/base-files/etc/board.d/02_network | 2 +- target/linux/netlogic/base-files/etc/board.d/02_network | 2 +- target/linux/octeon/base-files/etc/board.d/01_network | 2 +- target/linux/orion/base-files/etc/board.d/02_network | 2 +- target/linux/oxnas/base-files/etc/board.d/01_leds | 2 +- target/linux/oxnas/base-files/etc/board.d/02_network | 2 +- target/linux/ramips/base-files/etc/board.d/01_leds | 2 +- target/linux/ramips/base-files/etc/board.d/02_network | 2 +- target/linux/realview/base-files/etc/board.d/00_model | 2 +- target/linux/realview/base-files/etc/board.d/02_network | 2 +- target/linux/sunxi/base-files/etc/board.d/02_network | 2 +- 38 files changed, 38 insertions(+), 38 deletions(-) (limited to 'target/linux') 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 -- cgit v1.2.3