domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tegra: sysupgrade: use get_image_dd wrapper

Browse Source 
This function eliminates false-positive errors emitted by dd.

Signed-off-by: Tomasz Maciej Nowak <tmn505@gmail.com>
[drop argument check changes]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
This commit is contained in:
Tomasz Maciej Nowak
2020-11-25 17:33:40 +01:00
committed by Adrian Schmutzler
parent fa9e8a008a
commit 30c95c4d26
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
target/linux/tegra/base-files/lib/upgrade/platform.sh
View File

@@ -13,7 +13,7 @@ platform_check_image() {
get_partitions "/dev/$diskdev" bootdisk get_partitions "/dev/$diskdev" bootdisk
#extract the boot sector from the image #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 get_partitions /tmp/image.bs image
@@ -53,7 +53,7 @@ platform_do_upgrade() {
get_partitions "/dev/$diskdev" bootdisk get_partitions "/dev/$diskdev" bootdisk
#extract the boot sector from the image #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 get_partitions /tmp/image.bs image
@@ -64,7 +64,7 @@ platform_do_upgrade() {
fi fi
if [ -n "$diff" ]; then 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 # Separate removal and addtion is necessary; otherwise, partition 1
# will be missing if it overlaps with the old partition 2 # will be missing if it overlaps with the old partition 2
@@ -75,12 +75,12 @@ platform_do_upgrade() {
fi fi
#write uboot image #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 #iterate over each partition from the image and write it to the boot disk
while read part start size; do while read part start size; do
if export_partdevice partdev $part; then if export_partdevice partdev $part; then
echo "Writing image to /dev/$partdev..." 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 else
echo "Unable to find partition $part device, skipped." echo "Unable to find partition $part device, skipped."
fi fi
@@ -88,5 +88,5 @@ platform_do_upgrade() {
#copy partition uuid #copy partition uuid
echo "Writing new UUID to /dev/$diskdev..." 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
} }