Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mvebu: 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>
This commit is contained in:
Tomasz Maciej Nowak 2020-11-25 17:33:36 +01:00 committed by Adrian Schmutzler
parent f06adb64bf
commit 456f5680db
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
target/linux/mvebu/base-files/lib/upgrade/sdcard.sh
View file

@ -10,7 +10,7 @@ platform_check_image_sdcard() {
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
@ -41,7 +41,7 @@ platform_do_upgrade_sdcard() {
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
@ -52,7 +52,7 @@ platform_do_upgrade_sdcard() {
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
@ -60,12 +60,12 @@ platform_do_upgrade_sdcard() {
partx -a - "/dev/$diskdev" partx -a - "/dev/$diskdev"
else else
#write uboot image #write uboot image
get_image "$@" | dd of="$diskdev" bs=512 skip=1 seek=1 count=2048 conv=fsync 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 #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
@ -73,7 +73,7 @@ platform_do_upgrade_sdcard() {
#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
fi fi
case "$board" in case "$board" in