[source] base-files: add preinit ifname detection based on board.json
LEDE Commits
lede-commits at lists.infradead.org
Sat Aug 13 06:52:16 PDT 2016
jogo pushed a commit to source.git, branch master:
https://git.lede-project.org/?p=source.git;a=commitdiff;h=c18edcec4500008a1dabf0b017322eb23b059c58
commit c18edcec4500008a1dabf0b017322eb23b059c58
Author: Jonas Gorski <jonas.gorski at gmail.com>
AuthorDate: Thu Jul 28 22:58:59 2016 +0200
base-files: add preinit ifname detection based on board.json
Make use of the existing board.d to autodetect lan ifname in a generic way.
Signed-off-by: Jonas Gorski <jonas.gorski at gmail.com>
---
.../files/lib/preinit/10_indicate_preinit | 29 ++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/package/base-files/files/lib/preinit/10_indicate_preinit b/package/base-files/files/lib/preinit/10_indicate_preinit
index b9368d9..2062433 100644
--- a/package/base-files/files/lib/preinit/10_indicate_preinit
+++ b/package/base-files/files/lib/preinit/10_indicate_preinit
@@ -9,6 +9,33 @@ preinit_ip_config() {
ip -4 address add $pi_ip/$pi_netmask broadcast $pi_broadcast dev $1
}
+preinit_config_board() {
+ /bin/board_detect /tmp/board.json
+
+ [ -f "/tmp/board.json" ] || return
+
+ . /usr/share/libubox/jshn.sh
+
+ json_init
+ json_load "$(cat /tmp/board.json)"
+
+ json_select network
+ json_select "lan"
+ json_get_vars ifname
+ json_select ..
+ json_select ..
+
+ [ -n "$ifname" ] || return
+
+ # only use the first one
+ ifname=${ifname%% *}
+
+ # trim any vlan ids
+ ifname=${ifname%\.*}
+
+ preinit_ip_config $ifname
+}
+
preinit_ip() {
# if the preinit interface isn't specified and ifname is set in
# preinit.arch use that interface
@@ -18,6 +45,8 @@ preinit_ip() {
if [ -n "$pi_ifname" ]; then
preinit_ip_config $pi_ifname
+ elif [ -d "/etc/board.d/" ]; then
+ preinit_config_board
fi
}
More information about the lede-commits
mailing list