projects
/
lede-git
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
base-files: don't overwrite model name set by target
[lede-git/.git]
/
package
/
base-files
/
files
/
bin
/
board_detect
diff --git
a/package/base-files/files/bin/board_detect
b/package/base-files/files/bin/board_detect
index ddd17a16337d1159cc05fda4d6ce1c7a0dd34e75..441db6a08fc9e349b3fca1efc68a9c7934d3bb77 100755
(executable)
--- a/
package/base-files/files/bin/board_detect
+++ b/
package/base-files/files/bin/board_detect
@@
-1,14
+1,14
@@
#!/bin/sh
#!/bin/sh
-[ -d "/etc/board.d/" -a ! -f "/etc/board.json" ] || {
+CFG=$1
+
+[ -n "$CFG" ] || CFG=/etc/board.json
+
+[ -d "/etc/board.d/" -a ! -s "$CFG" ] && {
for a in `ls /etc/board.d/*`; do
[ -x $a ] || continue;
$(. $a)
done
}
for a in `ls /etc/board.d/*`; do
[ -x $a ] || continue;
$(. $a)
done
}
-[ -f "/etc/board.json" ] || return 1
-[ -f "/etc/config/network" ] || {
- touch /etc/config/network
- /bin/config_generate
-}
+[ -s "$CFG" ] || return 1