ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-30 10:39:04 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

mvebu: sysupgrade: use v function for writing logs

Browse Source 
Sync with x86 target changes.

Signed-off-by: Tomasz Maciej Nowak <tmn505@gmail.com>
This commit is contained in:
Tomasz Maciej Nowak 2020-12-01 18:29:16 +01:00 committed by Adrian Schmutzler
parent c71500fd45
commit b5036569aa
2 changed files with 7 additions and 7 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

@ -3,7 +3,7 @@ platform_check_image_sdcard() {
local diskdev partdev diff local diskdev partdev diff
export_bootdevice && export_partdevice diskdev 0 || { export_bootdevice && export_partdevice diskdev 0 || {
echo "Unable to determine upgrade device" v "Unable to determine upgrade device"
return 1 return 1
} }
@ -20,7 +20,7 @@ platform_check_image_sdcard() {
rm -f /tmp/image.bs /tmp/partmap.bootdisk /tmp/partmap.image rm -f /tmp/image.bs /tmp/partmap.bootdisk /tmp/partmap.image
if [ -n "$diff" ]; then if [ -n "$diff" ]; then
echo "Partition layout has changed. Full image will be written." v "Partition layout has changed. Full image will be written."
ask_bool 0 "Abort" && exit 1 ask_bool 0 "Abort" && exit 1
return 0 return 0
fi fi
@ -31,7 +31,7 @@ platform_do_upgrade_sdcard() {
local diskdev partdev diff local diskdev partdev diff
export_bootdevice && export_partdevice diskdev 0 || { export_bootdevice && export_partdevice diskdev 0 || {
echo "Unable to determine upgrade device" v "Unable to determine upgrade device"
return 1 return 1
} }
@ -64,15 +64,15 @@ platform_do_upgrade_sdcard() {
#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..." v "Writing image to /dev/$partdev..."
get_image_dd "$1" 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." v "Unable to find partition $part device, skipped."
fi fi
done < /tmp/partmap.image done < /tmp/partmap.image
#copy partition uuid #copy partition uuid
echo "Writing new UUID to /dev/$diskdev..." v "Writing new UUID to /dev/$diskdev..."
get_image_dd "$1" 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

2
target/linux/mvebu/cortexa9/base-files/lib/upgrade/linksys.sh
View File

@ -57,7 +57,7 @@ platform_do_upgrade_linksys() {
if [ ! -n "$part_label" ] if [ ! -n "$part_label" ]
then then
echo "cannot find target partition" v "cannot find target partition"
exit 1 exit 1
fi fi