summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin2024-09-22 07:04:55 +0000
committerJohn Crispin2024-10-02 13:41:33 +0000
commit7a120ee72e06217d87dfdff819052a84db32fd2b (patch)
treee4312db58b1baf6f7f1221ff0da6283f9618cfb3
parente7c7a3c154f2eb83808ec9b3e1a345bda4082781 (diff)
downloadopenwrt-7a120ee72e06217d87dfdff819052a84db32fd2b.tar.gz
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>
-rwxr-xr-xpackage/base-files/files/etc/init.d/boot3
1 files changed, 2 insertions, 1 deletions
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