aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/apm821xx
diff options
context:
space:
mode:
authorMathias Kresin <dev@kresin.me>2017-07-09 13:00:36 +0200
committerMathias Kresin <dev@kresin.me>2017-07-15 23:13:34 +0200
commite4e984f2a07d2cd96d8e5e90955bc268eb5d4e5a (patch)
treea4534355402283a176866ce6b03f774d8cf98769 /target/linux/apm821xx
parente0b9ec8e969e1c37c284cfa2f252e9b0a71157db (diff)
downloadupstream-e4e984f2a07d2cd96d8e5e90955bc268eb5d4e5a.tar.gz
upstream-e4e984f2a07d2cd96d8e5e90955bc268eb5d4e5a.tar.bz2
upstream-e4e984f2a07d2cd96d8e5e90955bc268eb5d4e5a.zip
treewide: use only board_name function to get name
Do not parse /tmp/sysinfo/board_name, /proc/cpuinfo or the device tree compatible string directly. Always use the board_name function to get the board name. The admswconfig package still reads /proc/cpuinfo directly. The code looks somehow broken and the whole adm5120 which uses this package looks unmaintained. Leave it as it is for now. Signed-off-by: Mathias Kresin <dev@kresin.me>
Diffstat (limited to 'target/linux/apm821xx')
-rw-r--r--target/linux/apm821xx/base-files/lib/preinit/79_move_config4
-rwxr-xr-xtarget/linux/apm821xx/base-files/lib/upgrade/merakinand.sh2
2 files changed, 4 insertions, 2 deletions
diff --git a/target/linux/apm821xx/base-files/lib/preinit/79_move_config b/target/linux/apm821xx/base-files/lib/preinit/79_move_config
index f45619fdbd..3ca8b0a71c 100644
--- a/target/linux/apm821xx/base-files/lib/preinit/79_move_config
+++ b/target/linux/apm821xx/base-files/lib/preinit/79_move_config
@@ -3,7 +3,9 @@
BOOTPART=/dev/sda1
move_config() {
- grep -q 'MyBook Live' /proc/cpuinfo || return
+ . /lib/functions.sh
+
+ [ "$(board_name)" = "mbl" ] || return
if [ -b $BOOTPART ]; then
mkdir -p /boot
mount -t ext4 -o rw,noatime $BOOTPART /boot
diff --git a/target/linux/apm821xx/base-files/lib/upgrade/merakinand.sh b/target/linux/apm821xx/base-files/lib/upgrade/merakinand.sh
index f025082e76..fb961b8945 100755
--- a/target/linux/apm821xx/base-files/lib/upgrade/merakinand.sh
+++ b/target/linux/apm821xx/base-files/lib/upgrade/merakinand.sh
@@ -52,7 +52,7 @@ merakinand_do_platform_check() {
merakinand_do_upgrade() {
local tar_file="$1"
- local board_name="$(cat /tmp/sysinfo/board_name)"
+ local board_name="$(board_name)"
# Do we need to do any platform tweaks?
case "$board_name" in