ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-02-23 02:12:52 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

x86: upgrade: use v function for writting logs

Browse Source 
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
Signed-off-by: maurerr <mariusd84@gmail.com>
This commit is contained in:
Yousong Zhou 2020-11-03 11:03:31 +08:00 committed by maurerr
parent 9ff344b185
commit 5bcf003cc3
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
target/linux/x86/base-files/lib/upgrade/platform.sh
View File

@ -7,13 +7,13 @@ platform_check_image() {
case "$(get_magic_word "$1")" in case "$(get_magic_word "$1")" in
eb48|eb63) ;; eb48|eb63) ;;
*) *)
echo "Invalid image type" v "Invalid image type"
return 1 return 1
;; ;;
esac esac
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
} }
@ -30,7 +30,7 @@ platform_check_image() {
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
@ -57,7 +57,7 @@ platform_do_bootloader_upgrade() {
echo "(hd0) /dev/$diskdev" > /tmp/device.map echo "(hd0) /dev/$diskdev" > /tmp/device.map
part_magic_efi "/dev/$diskdev" && parttable=gpt part_magic_efi "/dev/$diskdev" && parttable=gpt
echo "Upgrading bootloader on /dev/$diskdev..." v "Upgrading bootloader on /dev/$diskdev..."
grub-bios-setup \ grub-bios-setup \
-m "/tmp/device.map" \ -m "/tmp/device.map" \
-d "/tmp/boot/boot/grub" \ -d "/tmp/boot/boot/grub" \
@ -73,7 +73,7 @@ platform_do_upgrade() {
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
} }
@ -107,15 +107,15 @@ platform_do_upgrade() {
#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 of="/dev/$partdev" ibs=512 obs=1M skip="$start" count="$size" conv=fsync get_image "$@" | dd 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 of="/dev/$diskdev" bs=1 skip=440 count=4 seek=440 conv=fsync get_image "$@" | dd of="/dev/$diskdev" bs=1 skip=440 count=4 seek=440 conv=fsync
platform_do_bootloader_upgrade "$diskdev" platform_do_bootloader_upgrade "$diskdev"