Skip to content
Snippets Groups Projects
Commit 390c733b authored by John Crispin's avatar John Crispin Committed by Andreas Gnau
Browse files

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: default avatarJohn Crispin <john@phrozen.org>
(cherry picked from commit 7a120ee72e06217d87dfdff819052a84db32fd2b)
parent cea20cdd
No related branches found
No related tags found
1 merge request!693base-files: Backport board.json enhancements
......@@ -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
......@@ -45,6 +44,8 @@ boot() {
sleep 1
}
mkdir -p /tmp/.uci
[ -f /etc/uci-defaults/30_uboot-envtools ] && (. /etc/uci-defaults/30_uboot-envtools)
/bin/config_generate
uci_apply_defaults
sync
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment