From 21ea086bd349fb8b91f3ea46b62013c5cd148aab Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Thu, 3 Dec 2015 22:42:09 +0000 Subject: [PATCH] octeon: switch from uci-defaults to board.d Signed-off-by: Jo-Philipp Wich SVN-Revision: 47734 --- .../octeon/base-files/etc/board.d/00_model | 13 ++++++++ .../octeon/base-files/etc/board.d/01_network | 25 +++++++++++++++ .../base-files/etc/uci-defaults/01_network | 31 ------------------- 3 files changed, 38 insertions(+), 31 deletions(-) create mode 100755 target/linux/octeon/base-files/etc/board.d/00_model create mode 100755 target/linux/octeon/base-files/etc/board.d/01_network delete mode 100644 target/linux/octeon/base-files/etc/uci-defaults/01_network diff --git a/target/linux/octeon/base-files/etc/board.d/00_model b/target/linux/octeon/base-files/etc/board.d/00_model new file mode 100755 index 0000000000..ec07709e0c --- /dev/null +++ b/target/linux/octeon/base-files/etc/board.d/00_model @@ -0,0 +1,13 @@ +#!/bin/sh +# Copyright (C) 2015 OpenWrt.org + +. /lib/functions/uci-defaults-new.sh + +board_config_update + +ucidef_set_board_id "$(cat /tmp/sysinfo/board_name)" +ucidef_set_model_name "$(cat /tmp/sysinfo/model)" + +board_config_flush + +exit 0 diff --git a/target/linux/octeon/base-files/etc/board.d/01_network b/target/linux/octeon/base-files/etc/board.d/01_network new file mode 100755 index 0000000000..f07bdf8ca6 --- /dev/null +++ b/target/linux/octeon/base-files/etc/board.d/01_network @@ -0,0 +1,25 @@ +#!/bin/sh +# +# Copyright (C) 2014-2015 OpenWrt.org +# + +. /lib/functions/uci-defaults-new.sh +. /lib/functions/octeon.sh + +board_config_update + +board=$(octeon_board_name) + +case "$board" in +erlite) + ucidef_set_interfaces_lan_wan "eth0" "eth1" + ;; + +*) + ucidef_set_interfaces_lan_wan "eth0" "eth1" + ;; +esac + +board_config_flush + +exit 0 diff --git a/target/linux/octeon/base-files/etc/uci-defaults/01_network b/target/linux/octeon/base-files/etc/uci-defaults/01_network deleted file mode 100644 index bda8d0c75c..0000000000 --- a/target/linux/octeon/base-files/etc/uci-defaults/01_network +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2014 OpenWrt.org -# - -[ -e /etc/config/network ] && exit 0 - -. /lib/functions/uci-defaults.sh -. /lib/functions/octeon.sh - -touch /etc/config/network - -board=$(octeon_board_name) - -case "$board" in -erlite) - ucidef_set_interface_loopback - ucidef_set_interface_lan 'eth0' - ucidef_set_interface_wan 'eth1' - ;; - -*) - ucidef_set_interface_loopback - ucidef_set_interface_wan 'eth1' - ucidef_set_interface_lan 'eth0' - ;; -esac - -uci commit network - -exit 0 -- 2.30.2