ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-01-30 16:14:12 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

x86: sysupgrade: refactor platform_do_upgrade

Browse Source 
By returning early when no upgrade device can be found and handling the
SAVE_PARTITIONS=0 case differently, we can get rid of two levels of if.

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
This commit is contained in:
Matthias Schiffer 2017-05-03 09:05:25 +02:00
parent 19b84cfff2
commit a77633d36d
No known key found for this signature in database
GPG Key ID: 16EF3F64CB201D9C
1 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,8 +47,13 @@ platform_copy_config() {
platform_do_upgrade() { platform_do_upgrade() {
local diskdev partdev diff local diskdev partdev diff
if export_bootdevice && export_partdevice diskdev 0; then export_bootdevice && export_partdevice diskdev 0 || {
echo "Unable to determine upgrade device"
return 1
}
sync sync
if [ "$SAVE_PARTITIONS" = "1" ]; then if [ "$SAVE_PARTITIONS" = "1" ]; then
get_partitions "/dev/$diskdev" bootdisk get_partitions "/dev/$diskdev" bootdisk
@ -59,6 +64,10 @@ platform_do_upgrade() {
#compare tables #compare tables
diff="$(grep -F -x -v -f /tmp/partmap.bootdisk /tmp/partmap.image)" diff="$(grep -F -x -v -f /tmp/partmap.bootdisk /tmp/partmap.image)"
else
diff=1
fi
if [ -n "$diff" ]; then if [ -n "$diff" ]; then
get_image "$@" | dd of="/dev/$diskdev" bs=4096 conv=fsync get_image "$@" | dd of="/dev/$diskdev" bs=4096 conv=fsync
return 0 return 0
@ -77,10 +86,4 @@ 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 of="/dev/$diskdev" bs=1 skip=440 count=4 seek=440 conv=fsync
else
get_image "$@" | dd of="/dev/$diskdev" bs=4096 conv=fsync
fi
sleep 1
fi
} }