Skip to content
Snippets Groups Projects
Commit 30c95c4d authored by Tomasz Maciej Nowak's avatar Tomasz Maciej Nowak Committed by Adrian Schmutzler
Browse files

tegra: sysupgrade: use get_image_dd wrapper


This function eliminates false-positive errors emitted by dd.

Signed-off-by: default avatarTomasz Maciej Nowak <tmn505@gmail.com>
[drop argument check changes]
Signed-off-by: default avatarAdrian Schmutzler <freifunk@adrianschmutzler.de>
parent fa9e8a00
No related branches found
No related tags found
No related merge requests found
......@@ -13,7 +13,7 @@ platform_check_image() {
get_partitions "/dev/$diskdev" bootdisk
#extract the boot sector from the image
get_image "$@" | dd of=/tmp/image.bs count=1 bs=512b 2>/dev/null
get_image_dd "$1" of=/tmp/image.bs count=1 bs=512b
get_partitions /tmp/image.bs image
......@@ -53,7 +53,7 @@ platform_do_upgrade() {
get_partitions "/dev/$diskdev" bootdisk
#extract the boot sector from the image
get_image "$@" | dd of=/tmp/image.bs count=1 bs=512b
get_image_dd "$1" of=/tmp/image.bs count=1 bs=512b
get_partitions /tmp/image.bs image
......@@ -64,7 +64,7 @@ platform_do_upgrade() {
fi
if [ -n "$diff" ]; then
get_image "$@" | dd of="/dev/$diskdev" bs=4096 conv=fsync
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
......@@ -75,12 +75,12 @@ platform_do_upgrade() {
fi
#write uboot image
get_image "$@" | dd of="$diskdev" bs=512 skip=1 seek=1 count=4097 conv=fsync,notrunc
get_image_dd "$1" of="$diskdev" bs=512 skip=1 seek=1 count=4097 conv=fsync,notrunc
#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
echo "Writing image to /dev/$partdev..."
get_image "$@" | dd of="/dev/$partdev" ibs="512" obs=1M skip="$start" count="$size" conv=fsync
get_image_dd "$1" of="/dev/$partdev" ibs="512" obs=1M skip="$start" count="$size" conv=fsync
else
echo "Unable to find partition $part device, skipped."
fi
......@@ -88,5 +88,5 @@ platform_do_upgrade() {
#copy partition uuid
echo "Writing new UUID to /dev/$diskdev..."
get_image "$@" | dd of="/dev/$diskdev" bs=1 skip=440 count=4 seek=440 conv=fsync
get_image_dd "$1" of="/dev/$diskdev" bs=1 skip=440 count=4 seek=440 conv=fsync
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment