EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

base-files: let config_generate call board_detect

Browse Source 
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:
Jonas Gorski 2016-08-13 14:04:23 +02:00
parent 0ddae04c22
commit e934a129f0
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/base-files/files/bin/board_detect
View File

@ -8,5 +8,3 @@
} }
[ -f "/etc/board.json" ] || return 1 [ -f "/etc/board.json" ] || return 1
/bin/config_generate

2
package/base-files/files/bin/config_generate
View File

@ -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() {

2
package/base-files/files/etc/init.d/boot
View File

@ -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