base-files: let config_generate call board_detect
Instead of board_detect generating the config as a side effect, let config_generate call board_detect as needed. Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
This commit is contained in:
parent
0ddae04c22
commit
e934a129f0
3 changed files with 2 additions and 4 deletions
|
@ -8,5 +8,3 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
[ -f "/etc/board.json" ] || return 1
|
[ -f "/etc/board.json" ] || return 1
|
||||||
|
|
||||||
/bin/config_generate
|
|
||||||
|
|
|
@ -4,7 +4,7 @@ CFG=/etc/board.json
|
||||||
|
|
||||||
. /usr/share/libubox/jshn.sh
|
. /usr/share/libubox/jshn.sh
|
||||||
|
|
||||||
[ -f $CFG ] || exit 1
|
[ -f $CFG ] || /bin/board_detect || exit 1
|
||||||
[ -f /etc/config/network -a -f /etc/config/system ] && exit 0
|
[ -f /etc/config/network -a -f /etc/config/system ] && exit 0
|
||||||
|
|
||||||
generate_static_network() {
|
generate_static_network() {
|
||||||
|
|
|
@ -47,7 +47,7 @@ boot() {
|
||||||
}
|
}
|
||||||
rm -f /tmp/wireless.tmp
|
rm -f /tmp/wireless.tmp
|
||||||
|
|
||||||
/bin/board_detect
|
/bin/config_generate
|
||||||
uci_apply_defaults
|
uci_apply_defaults
|
||||||
|
|
||||||
# temporary hack until configd exists
|
# temporary hack until configd exists
|
||||||
|
|
Loading…
Reference in a new issue