From 99cf19dfc2970c1e8bb40ee184319722a6d50bc1 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Thu, 3 Dec 2015 22:46:54 +0000 Subject: [PATCH] netlogic: switch from uci-defaults to board.d Signed-off-by: Jo-Philipp Wich SVN-Revision: 47736 --- .../linux/netlogic/base-files/etc/board.d/00_model | 13 +++++++++++++ .../etc/{uci-defaults => board.d}/02_network | 10 +++------- 2 files changed, 16 insertions(+), 7 deletions(-) create mode 100755 target/linux/netlogic/base-files/etc/board.d/00_model rename target/linux/netlogic/base-files/etc/{uci-defaults => board.d}/02_network (57%) mode change 100644 => 100755 diff --git a/target/linux/netlogic/base-files/etc/board.d/00_model b/target/linux/netlogic/base-files/etc/board.d/00_model new file mode 100755 index 0000000000..ec07709e0c --- /dev/null +++ b/target/linux/netlogic/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/netlogic/base-files/etc/uci-defaults/02_network b/target/linux/netlogic/base-files/etc/board.d/02_network old mode 100644 new mode 100755 similarity index 57% rename from target/linux/netlogic/base-files/etc/uci-defaults/02_network rename to target/linux/netlogic/base-files/etc/board.d/02_network index e271e17097..1ca1214535 --- a/target/linux/netlogic/base-files/etc/uci-defaults/02_network +++ b/target/linux/netlogic/base-files/etc/board.d/02_network @@ -3,14 +3,10 @@ # Copyright (C) 2014 OpenWrt.org # -[ -e /etc/config/network ] && exit 0 - -touch /etc/config/network - -. /lib/functions/uci-defaults.sh +. /lib/functions/uci-defaults-now.sh . /lib/netlogic.sh -ucidef_set_interface_loopback +board_config_update case "$board_name" in "xlp-evp" |\ @@ -23,6 +19,6 @@ case "$board_name" in esac -uci commit network +board_config_flush exit 0