From: John Crispin <blogic@openwrt.org>
Date: Mon, 11 Apr 2016 09:58:57 +0000 (+0200)
Subject: base-files: fix error message during boot
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=5e85ae9;p=openwrt%2Fstaging%2Flinusw.git

base-files: fix error message during boot

preinit spews out this message

"cat: can't open '/proc/device-tree/model': No such file or directory"

Signed-off-by: John Crispin <john@phrozen.org>
---

diff --git a/package/base-files/files/lib/preinit/10_sysinfo b/package/base-files/files/lib/preinit/10_sysinfo
index 42fd5b6239..be1e6aeca9 100644
--- a/package/base-files/files/lib/preinit/10_sysinfo
+++ b/package/base-files/files/lib/preinit/10_sysinfo
@@ -3,7 +3,7 @@ do_sysinfo_generic() {
 	mkdir -p /tmp/sysinfo
 	[ -e /tmp/sysinfo/board_name ] || \
 		echo "$(strings /proc/device-tree/compatible | head -1)" > /tmp/sysinfo/board_name
-	[ -e /tmp/sysinfo/model ] || \
+	[ -n /tmp/sysinfo/model -a -e /proc/device-tree/model ] && \
 		echo "$(cat /proc/device-tree/model)" > /tmp/sysinfo/model
 }