From 60fce1258c5aafa8464938f3d237e92df8d6a377 Mon Sep 17 00:00:00 2001
From: Mathias Kresin <dev@kresin.me>
Date: Sat, 28 Jan 2017 16:19:35 +0100
Subject: [PATCH] base-files: don't overwrite model name set by target
The condition is always true due to the literal string followed the
-n test parameter. A model name set by target scripts always gets
overwritten this way.
Change the condition to check for an already existing destination file
as it was before 5e85ae9 ("base-files: fix error message during boot").
Signed-off-by: Mathias Kresin <dev@kresin.me>
---
package/base-files/files/lib/preinit/10_sysinfo | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/base-files/files/lib/preinit/10_sysinfo b/package/base-files/files/lib/preinit/10_sysinfo
index be1e6aeca9..65b50968e2 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
- [ -n /tmp/sysinfo/model -a -e /proc/device-tree/model ] && \
+ [ ! -e /tmp/sysinfo/model -a -e /proc/device-tree/model ] && \
echo "$(cat /proc/device-tree/model)" > /tmp/sysinfo/model
}
--
GitLab