caskd/openwrt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86: fix sysupgrades on disks with 4k block size

Browse Source 
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>
This commit is contained in:
Felix Fietkau 2017-01-25 08:13:11 +01:00
parent d872b732e7
commit b02c381b4b
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,20 +21,13 @@ platform_copy_config() {
} }
platform_do_upgrade() { platform_do_upgrade() {
local diskdev partdev ibs diff local diskdev partdev diff
if export_bootdevice && export_partdevice diskdev 0; then if export_bootdevice && export_partdevice diskdev 0; then
sync sync
if [ "$SAVE_PARTITIONS" = "1" ]; then if [ "$SAVE_PARTITIONS" = "1" ]; then
get_partitions "/dev/$diskdev" bootdisk 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 #extract the boot sector from the image
get_image "$@" | dd of=/tmp/image.bs count=1 bs=512b get_image "$@" | dd of=/tmp/image.bs count=1 bs=512b
@ -54,7 +47,7 @@ platform_do_upgrade() {
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="$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 else
echo "Unable to find partition $part device, skipped." echo "Unable to find partition $part device, skipped."
fi fi