aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Gorski <jonas.gorski@gmail.com>2016-08-13 14:04:23 +0200
committerJonas Gorski <jonas.gorski@gmail.com>2016-08-13 15:49:46 +0200
commite934a129f086435a39c663375d41367a54783b39 (patch)
tree1e04f8cd56a9ebc0ee7948a723277eb10c9d1954
parent0ddae04c226983e1e064d8750b8bb8724f077ad9 (diff)
downloadupstream-e934a129f086435a39c663375d41367a54783b39.tar.gz
upstream-e934a129f086435a39c663375d41367a54783b39.tar.bz2
upstream-e934a129f086435a39c663375d41367a54783b39.zip
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>
-rwxr-xr-xpackage/base-files/files/bin/board_detect2
-rwxr-xr-xpackage/base-files/files/bin/config_generate2
-rwxr-xr-xpackage/base-files/files/etc/init.d/boot2
3 files changed, 2 insertions, 4 deletions
diff --git a/package/base-files/files/bin/board_detect b/package/base-files/files/bin/board_detect
index beb7f4e659..3a23381c2c 100755
--- a/package/base-files/files/bin/board_detect
+++ b/package/base-files/files/bin/board_detect
@@ -8,5 +8,3 @@
}
[ -f "/etc/board.json" ] || return 1
-
-/bin/config_generate
diff --git a/package/base-files/files/bin/config_generate b/package/base-files/files/bin/config_generate
index 7f34eec881..80ed61b9e2 100755
--- a/package/base-files/files/bin/config_generate
+++ b/package/base-files/files/bin/config_generate
@@ -4,7 +4,7 @@ CFG=/etc/board.json
. /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
generate_static_network() {
diff --git a/package/base-files/files/etc/init.d/boot b/package/base-files/files/etc/init.d/boot
index 4a2010ce89..904f7db75e 100755
--- a/package/base-files/files/etc/init.d/boot
+++ b/package/base-files/files/etc/init.d/boot
@@ -47,7 +47,7 @@ boot() {
}
rm -f /tmp/wireless.tmp
- /bin/board_detect
+ /bin/config_generate
uci_apply_defaults
# temporary hack until configd exists