From: Jonas Gorski <jonas.gorski@gmail.com>
Date: Sat, 13 Aug 2016 12:04:23 +0000 (+0200)
Subject: base-files: let config_generate call board_detect
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=e934a129f086435a39c663375d41367a54783b39;p=openwrt%2Fstaging%2Fneocturne.git

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

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