aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathias Kresin <dev@kresin.me>2017-01-28 16:19:35 +0100
committerMathias Kresin <dev@kresin.me>2017-01-30 08:55:41 +0100
commit60fce1258c5aafa8464938f3d237e92df8d6a377 (patch)
treef421575593bc88361850941285b46748fbf3de68
parent37b489fe04174bdede9c2817e021d77775e274ea (diff)
downloadupstream-60fce1258c5aafa8464938f3d237e92df8d6a377.tar.gz
upstream-60fce1258c5aafa8464938f3d237e92df8d6a377.tar.bz2
upstream-60fce1258c5aafa8464938f3d237e92df8d6a377.zip
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>
-rw-r--r--package/base-files/files/lib/preinit/10_sysinfo2
1 files changed, 1 insertions, 1 deletions
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
}