octeon: get rid of /lib/functions/octeon.sh hackery, use sysinfo directly

Fixes sysupgrade

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 48558
This commit is contained in:
Felix Fietkau
2016-01-29 23:19:41 +00:00
parent f32de94e0a
commit beda11255b
5 changed files with 36 additions and 64 deletions

View File

@@ -0,0 +1,31 @@
do_sysinfo_octeon() {
local machine
local name
machine=$(grep "^system type" /proc/cpuinfo | sed "s/system type.*: \(.*\)/\1/g")
case "$machine" in
"UBNT_E100"*)
name="erlite"
;;
"UBNT_E200"*)
name="er"
;;
"UBNT_E220"*)
name="erpro"
;;
*)
name="generic"
;;
esac
[ -e "/tmp/sysinfo/" ] || mkdir -p "/tmp/sysinfo/"
echo "$name" > /tmp/sysinfo/board_name
echo "$machine" > /tmp/sysinfo/model
}
boot_hook_add preinit_main do_sysinfo_octeon

View File

@@ -2,11 +2,7 @@
# Copyright (C) 2014 OpenWrt.org
move_config() {
. /lib/functions/octeon.sh
local board="$(octeon_board_name)"
case "$board" in
case "$(cat /tmp/sysinfo/board_name)" in
erlite)
mount -t vfat /dev/sda1 /mnt
mv -f /mnt/sysupgrade.tgz /