diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2016-01-29 23:19:41 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2016-01-29 23:19:41 +0000 |
| commit | beda11255b27d2ec089aae4d8248000f213d323b (patch) | |
| tree | 0104bf6230cdda52838c7b268f0eb5f1eeba5e0e /target/linux/octeon/base-files/lib/preinit | |
| parent | f32de94e0a46e06586dfd4066465a9425fa64304 (diff) | |
| download | mtk-20170518-beda11255b27d2ec089aae4d8248000f213d323b.zip mtk-20170518-beda11255b27d2ec089aae4d8248000f213d323b.tar.gz mtk-20170518-beda11255b27d2ec089aae4d8248000f213d323b.tar.bz2 | |
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
Diffstat (limited to 'target/linux/octeon/base-files/lib/preinit')
| -rw-r--r-- | target/linux/octeon/base-files/lib/preinit/20_sysinfo | 31 | ||||
| -rw-r--r-- | target/linux/octeon/base-files/lib/preinit/79_move_config | 6 |
2 files changed, 32 insertions, 5 deletions
diff --git a/target/linux/octeon/base-files/lib/preinit/20_sysinfo b/target/linux/octeon/base-files/lib/preinit/20_sysinfo new file mode 100644 index 0000000..d8f467e --- /dev/null +++ b/target/linux/octeon/base-files/lib/preinit/20_sysinfo @@ -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 diff --git a/target/linux/octeon/base-files/lib/preinit/79_move_config b/target/linux/octeon/base-files/lib/preinit/79_move_config index 39cefd5..669999e 100644 --- a/target/linux/octeon/base-files/lib/preinit/79_move_config +++ b/target/linux/octeon/base-files/lib/preinit/79_move_config @@ -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 / |