aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2015-12-04 15:02:13 +0000
committerJo-Philipp Wich <jow@openwrt.org>2015-12-04 15:02:13 +0000
commitcacd3d083441694dacbfe9fce595bd3a7d4a4c28 (patch)
tree860b265aec61ed4eacd92ad172d90142ff262d02
parent75f3a9dabde6e7b811f66ca0f1b1601eb2d25319 (diff)
downloadmaster-187ad058-cacd3d083441694dacbfe9fce595bd3a7d4a4c28.tar.gz
master-187ad058-cacd3d083441694dacbfe9fce595bd3a7d4a4c28.tar.bz2
master-187ad058-cacd3d083441694dacbfe9fce595bd3a7d4a4c28.zip
mcs814x: switch from uci-defaults to board.d
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47761 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rwxr-xr-x[-rw-r--r--]target/linux/mcs814x/base-files/etc/board.d/01_leds (renamed from target/linux/mcs814x/base-files/etc/uci-defaults/01_leds)8
-rwxr-xr-xtarget/linux/mcs814x/base-files/etc/board.d/02_network12
-rw-r--r--target/linux/mcs814x/base-files/etc/config/network21
3 files changed, 17 insertions, 24 deletions
diff --git a/target/linux/mcs814x/base-files/etc/uci-defaults/01_leds b/target/linux/mcs814x/base-files/etc/board.d/01_leds
index 0c6972d8be..3b1de4ae9b 100644..100755
--- a/target/linux/mcs814x/base-files/etc/uci-defaults/01_leds
+++ b/target/linux/mcs814x/base-files/etc/board.d/01_leds
@@ -1,11 +1,13 @@
#!/bin/sh
#
-# Copyright (C) 2012 OpenWrt.org
+# Copyright (C) 2012-2015 OpenWrt.org
#
-. /lib/functions/uci-defaults.sh
+. /lib/functions/uci-defaults-new.sh
. /lib/mcs814x.sh
+board_config_update
+
board=$(mcs814x_board_name)
case "$board" in
@@ -21,6 +23,6 @@ rbt-832)
;;
esac
-ucidef_commit_leds
+board_config_flush
exit 0
diff --git a/target/linux/mcs814x/base-files/etc/board.d/02_network b/target/linux/mcs814x/base-files/etc/board.d/02_network
new file mode 100755
index 0000000000..a447923f42
--- /dev/null
+++ b/target/linux/mcs814x/base-files/etc/board.d/02_network
@@ -0,0 +1,12 @@
+#!/bin/sh
+#
+# Copyright (C) 2015 OpenWrt.org
+#
+
+. /lib/functions/uci-defaults-new.sh
+
+board_config_update
+ucidef_set_interface_lan "eth0"
+board_config_flush
+
+exit 0
diff --git a/target/linux/mcs814x/base-files/etc/config/network b/target/linux/mcs814x/base-files/etc/config/network
deleted file mode 100644
index cec7b2525c..0000000000
--- a/target/linux/mcs814x/base-files/etc/config/network
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (C) 2012 OpenWrt.org
-
-config interface loopback
- option ifname lo
- option proto static
- option ipaddr 127.0.0.1
- option netmask 255.0.0.0
-
-config interface lan
- option ifname eth0
- option proto static
- option ipaddr 192.168.1.1
- option netmask 255.255.255.0
- option ip6assign 60
-
-config interface wan6
- option ifname eth0
- option proto dhcpv6
-
-config globals globals
- option ula_prefix auto