From: John Crispin <john@phrozen.org>
Date: Sun, 22 Sep 2024 07:04:55 +0000 (+0200)
Subject: base-files: execute uboot-env script before calling config_generate
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7a120ee72e06217d87dfdff819052a84db32fd2b;p=openwrt%2Fstaging%2Fldir.git

base-files: execute uboot-env script before calling config_generate

This allows /etc/board.d/* scripts to use values from the uboot environment.

Signed-off-by: John Crispin <john@phrozen.org>
---

diff --git a/package/base-files/files/etc/init.d/boot b/package/base-files/files/etc/init.d/boot
index d17754d087..c7d1d4af3a 100755
--- a/package/base-files/files/etc/init.d/boot
+++ b/package/base-files/files/etc/init.d/boot
@@ -10,7 +10,6 @@ uci_apply_defaults() {
 	cd /etc/uci-defaults || return 0
 	files="$(ls)"
 	[ -z "$files" ] && return 0
-	mkdir -p /tmp/.uci
 	for file in $files; do
 		( . "./$(basename $file)" ) && rm -f "$file"
 	done
@@ -47,6 +46,8 @@ boot() {
 		sleep 1
 	}
 
+	mkdir -p /tmp/.uci
+	[ -f /etc/uci-defaults/30_uboot-envtools ] && (. /etc/uci-defaults/30_uboot-envtools)
 	/bin/config_generate
 	rm -f /tmp/.config_pending
 	/sbin/wifi config