diff options
| author | Felix Fietkau <nbd@nbd.name> | 2017-01-25 08:13:11 +0100 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2017-01-25 08:14:59 +0100 |
| commit | e9ecb228c9d80605884058d7653e2eb56ba64051 (patch) | |
| tree | 76388447f0a4dd9957942f442fb14c28105c1344 | |
| parent | e9d21739211261903441d150bc4b74732137c580 (diff) | |
| download | upstream-e9ecb228c9d80605884058d7653e2eb56ba64051.tar.gz upstream-e9ecb228c9d80605884058d7653e2eb56ba64051.tar.bz2 upstream-e9ecb228c9d80605884058d7653e2eb56ba64051.zip | |
x86: fix sysupgrades on disks with 4k block size
Even when the disk uses 4k blocks, the partition table still uses units
of 512 byte sectors. Always use ibs=512 for the offsets
Signed-off-by: Felix Fietkau <nbd@nbd.name>
| -rw-r--r-- | target/linux/x86/base-files/lib/upgrade/platform.sh | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/target/linux/x86/base-files/lib/upgrade/platform.sh b/target/linux/x86/base-files/lib/upgrade/platform.sh index 8850917062..d3e9f360aa 100644 --- a/target/linux/x86/base-files/lib/upgrade/platform.sh +++ b/target/linux/x86/base-files/lib/upgrade/platform.sh @@ -21,20 +21,13 @@ platform_copy_config() { } platform_do_upgrade() { - local diskdev partdev ibs diff + local diskdev partdev diff if export_bootdevice && export_partdevice diskdev 0; then sync if [ "$SAVE_PARTITIONS" = "1" ]; then get_partitions "/dev/$diskdev" bootdisk - #get block size - if [ -f "/sys/block/$diskdev/queue/physical_block_size" ]; then - ibs="$(cat "/sys/block/$diskdev/queue/physical_block_size")" - else - ibs=512 - fi - #extract the boot sector from the image get_image "$@" | dd of=/tmp/image.bs count=1 bs=512b @@ -54,7 +47,7 @@ platform_do_upgrade() { while read part start size; do if export_partdevice partdev $part; then echo "Writing image to /dev/$partdev..." - get_image "$@" | dd of="/dev/$partdev" ibs="$ibs" 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 echo "Unable to find partition $part device, skipped." fi |