diff options
author | Stijn Tintel <stijn@linux-ipv6.be> | 2021-08-07 01:42:43 +0300 |
---|---|---|
committer | Stijn Tintel <stijn@linux-ipv6.be> | 2021-08-07 01:43:39 +0300 |
commit | b1bff5cb57fab31932ceaa0dea9509effe9f5800 (patch) | |
tree | fa2f1f99f3b2fd18b2aee129a68a74f16b884774 /target/linux/mvebu/base-files | |
parent | 8347d8b4fbe41ce7db386f948df3ebb6c6bc32d3 (diff) | |
download | upstream-b1bff5cb57fab31932ceaa0dea9509effe9f5800.tar.gz upstream-b1bff5cb57fab31932ceaa0dea9509effe9f5800.tar.bz2 upstream-b1bff5cb57fab31932ceaa0dea9509effe9f5800.zip |
mvebu: switch to generic sdcard upgrade method
Now that we have a generic sdcard upgrade method, which was copied from
the mvebu platform method, we can switch mvebu to the generic method.
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'target/linux/mvebu/base-files')
-rw-r--r-- | target/linux/mvebu/base-files/lib/upgrade/sdcard.sh | 91 |
1 files changed, 0 insertions, 91 deletions
diff --git a/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh b/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh deleted file mode 100644 index caa726b4d5..0000000000 --- a/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh +++ /dev/null @@ -1,91 +0,0 @@ -platform_check_image_sdcard() { - local file="$1" - local diskdev partdev diff - - export_bootdevice && export_partdevice diskdev 0 || { - v "Unable to determine upgrade device" - return 1 - } - - get_partitions "/dev/$diskdev" bootdisk - - v "Extract boot sector from the image" - get_image_dd "$1" of=/tmp/image.bs count=1 bs=512b - - get_partitions /tmp/image.bs image - - #compare tables - diff="$(grep -F -x -v -f /tmp/partmap.bootdisk /tmp/partmap.image)" - - rm -f /tmp/image.bs /tmp/partmap.bootdisk /tmp/partmap.image - - if [ -n "$diff" ]; then - v "Partition layout has changed. Full image will be written." - ask_bool 0 "Abort" && exit 1 - return 0 - fi -} - -platform_do_upgrade_sdcard() { - local board=$(board_name) - local diskdev partdev diff - - export_bootdevice && export_partdevice diskdev 0 || { - v "Unable to determine upgrade device" - return 1 - } - - sync - - if [ "$UPGRADE_OPT_SAVE_PARTITIONS" = "1" ]; then - get_partitions "/dev/$diskdev" bootdisk - - v "Extract boot sector from the image" - get_image_dd "$1" of=/tmp/image.bs count=1 bs=512b - - get_partitions /tmp/image.bs image - - #compare tables - diff="$(grep -F -x -v -f /tmp/partmap.bootdisk /tmp/partmap.image)" - else - diff=1 - fi - - if [ -n "$diff" ]; then - get_image_dd "$1" of="/dev/$diskdev" bs=4096 conv=fsync - - # Separate removal and addtion is necessary; otherwise, partition 1 - # will be missing if it overlaps with the old partition 2 - partx -d - "/dev/$diskdev" - partx -a - "/dev/$diskdev" - else - v "Writing bootloader to /dev/$diskdev" - get_image_dd "$1" of="$diskdev" bs=512 skip=1 seek=1 count=2048 conv=fsync - #iterate over each partition from the image and write it to the boot disk - while read part start size; do - if export_partdevice partdev $part; then - v "Writing image to /dev/$partdev..." - get_image_dd "$1" of="/dev/$partdev" ibs="512" obs=1M skip="$start" count="$size" conv=fsync - else - v "Unable to find partition $part device, skipped." - fi - done < /tmp/partmap.image - - v "Writing new UUID to /dev/$diskdev..." - get_image_dd "$1" of="/dev/$diskdev" bs=1 skip=440 count=4 seek=440 conv=fsync - fi - - sleep 1 -} - -platform_copy_config_sdcard() { - local partdev - - if export_partdevice partdev 1; then - mkdir -p /boot - [ -f /boot/kernel.img ] || mount -o rw,noatime /dev/$partdev /boot - cp -af "$UPGRADE_BACKUP" "/boot/$BACKUP_FILE" - sync - umount /boot - fi -} |