0026-sunxi-sysupgrade-don-t-write-partitions-twice.patch 1.4 KB

1234567891011121314151617181920212223242526272829
  1. From: Matthias Schiffer <mschiffer@universe-factory.net>
  2. Date: Thu, 4 May 2017 07:29:58 +0200
  3. Subject: sunxi: sysupgrade: don't write partitions twice
  4. When existing partitions are retained, the dd call writing the uboot image
  5. in the space before the first partition was accidentally writing the whole
  6. image, making the code for individual partitions redundant. Limit the copy
  7. to 1016KiB (the first 8KiB are skipped, and the first partition starts at
  8. 1024KiB).
  9. In addition, conv=notrunc is replaced with conv=fsync. It seems this was an
  10. oversight, as notrunc doesn't make sense for block devices and all other dd
  11. commands use conv=fsync.
  12. Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
  13. diff --git a/target/linux/sunxi/base-files/lib/upgrade/platform.sh b/target/linux/sunxi/base-files/lib/upgrade/platform.sh
  14. index f2cd970d428a780d7497d8802765c656a47ff421..776bdf53bf89c5eafc24b7b59b943e12f3fab77e 100644
  15. --- a/target/linux/sunxi/base-files/lib/upgrade/platform.sh
  16. +++ b/target/linux/sunxi/base-files/lib/upgrade/platform.sh
  17. @@ -43,7 +43,7 @@ platform_do_upgrade() {
  18. fi
  19. #write uboot image
  20. - get_image "$@" | dd of="$diskdev" bs=1024 skip=8 seek=8 conv=notrunc
  21. + get_image "$@" | dd of="$diskdev" bs=1024 skip=8 seek=8 count=1016 conv=fsync
  22. #iterate over each partition from the image and write it to the boot disk
  23. while read part start size; do
  24. part="$(($part - 2))"