KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

procd: more nand takeover fixes

Browse source 
if the initramfs kernel and payload were flashed in one block, the payload might not be at the start of the ubi partition due to bad blocks inside the kernel partition.

Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 43513
This commit is contained in:
John Crispin 2014-12-03 20:22:37 +00:00
parent c3bb3906ee
commit 19a6f3dd11
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
package/system/procd/files/nand-preinit.sh
View file

@ -4,14 +4,18 @@
nand_takeover() { nand_takeover() {
. /lib/upgrade/nand.sh . /lib/upgrade/nand.sh
mtd=$(find_mtd_index "$CI_UBIPART") mtd=$(find_mtd_index "$CI_UBIPART")
local file_type="$(identify $2)" esize=$(cat /proc/mtd | grep mtd$mtd |cut -d" " -f 3)
mtd -l 400 dump /dev/mtd$mtd > /tmp/takeover.hdr [ -z "$esize" ] && return 1
MAGIC=$(dd if=/tmp/takeover.hdr bs=1 skip=261 count=5 2> /dev/null) esize=$(printf "%d" 0x$esize)
SIZE=$(printf "%d" 0x$(dd if=/tmp/takeover.hdr bs=4 count=1 2> /dev/null | hexdump -v -n 4 -e '1/1 "%02x"')) for a in `seq 0 64`; do
[ "$MAGIC" = "ustar" ] && { mtd -o $((a * esize)) -l 400 dump /dev/mtd$mtd > /tmp/takeover.hdr
mtd -l $((SIZE + 4)) dump /dev/mtd$mtd | dd bs=1 skip=4 of=/tmp/sysupgrade.tar MAGIC=$(dd if=/tmp/takeover.hdr bs=1 skip=261 count=5 2> /dev/null)
nand_do_upgrade_stage2 /tmp/sysupgrade.tar SIZE=$(printf "%d" 0x$(dd if=/tmp/takeover.hdr bs=4 count=1 2> /dev/null | hexdump -v -n 4 -e '1/1 "%02x"'))
} [ "$MAGIC" = "ustar" ] && {
mtd -o $((a * esize)) -l $((SIZE + 4)) dump /dev/mtd$mtd | dd bs=1 skip=4 of=/tmp/sysupgrade.tar
nand_do_upgrade_stage2 /tmp/sysupgrade.tar
}
done
} }
boot_hook_add initramfs nand_takeover boot_hook_add initramfs nand_takeover