Skip to content
Snippets Groups Projects
Select Git revision
  • b6a22ce79307853b175192178bb0333d976a3a6f
  • v2018.2.x default protected
  • 0x4A6F-rpi4
  • 0x4A6F-master
  • master
  • v2018.2.2-ffs
  • v2016.2.4-batmanbug
  • radv-filterd
  • v2016.2.x
  • hoodselector
  • v2016.1.x
  • babel
  • v2015.1.x
  • 2014.4.x
  • 2014.3.x
  • v2018.2.2-ffs0.1
  • v2018.2.1-ffs0.1
  • v2018.2.1
  • v2018.2-ffs0.1
  • v2018.2
  • v2018.1.4
  • v2018.1.3
  • v2018.1.2
  • v2018.1.1
  • v2018.1
  • v2017.1.8
  • v2017.1.7
  • v2017.1.6
  • v2017.1.5
  • v2017.1.4
  • v2017.1.3
  • v2017.1.2
  • v2016.2.7
  • v2017.1.1
  • v2017.1
35 results

0095-x86-fix-sysupgrades-on-disks-with-4k-block-size.patch

Blame
  • Forked from firmware / FFS Gluon
    Source project has a limited visibility.
    0095-x86-fix-sysupgrades-on-disks-with-4k-block-size.patch 1.69 KiB
    From: Felix Fietkau <nbd@nbd.name>
    Date: Wed, 25 Jan 2017 08:13:11 +0100
    Subject: 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>
    
    Backport of LEDE e9ecb228c9d80605884058d7653e2eb56ba64051
    
    diff --git a/target/linux/x86/base-files/lib/upgrade/platform.sh b/target/linux/x86/base-files/lib/upgrade/platform.sh
    index 8850917062618985126b5086dccfe11506ed1fbb..d3e9f360aadedad0995da55205364940c9884ba4 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