From 5a0348fdc3c01af24bc2a867ab2f71125615b1f0 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Mon, 1 Nov 2021 14:02:41 +0000 Subject: [PATCH] mediatek: mt7622: make use of find_mmc_part Use find_mmc_part instead of previously introduced get_partition_by_name which requires a custom kernel patch. Signed-off-by: Daniel Golle --- .../mt7622/base-files/lib/upgrade/platform.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/target/linux/mediatek/mt7622/base-files/lib/upgrade/platform.sh b/target/linux/mediatek/mt7622/base-files/lib/upgrade/platform.sh index 513741d6672..98775c6a134 100755 --- a/target/linux/mediatek/mt7622/base-files/lib/upgrade/platform.sh +++ b/target/linux/mediatek/mt7622/base-files/lib/upgrade/platform.sh @@ -13,15 +13,15 @@ platform_do_upgrade() { case "$rootdev" in mmc*) blockdev --rereadpt /dev/$rootdev || return 1 - local fitpart=$(get_partition_by_name $rootdev "production") + local fitpart=$(find_mmc_part "production" $rootdev) [ "$fitpart" ] || return 1 - dd if=/dev/zero of=/dev/$fitpart bs=4096 count=1 2>/dev/null + dd if=/dev/zero of=$fitpart bs=4096 count=1 2>/dev/null blockdev --rereadpt /dev/$rootdev - get_image "$1" | dd of=/dev/$fitpart + get_image "$1" | dd of=$fitpart blockdev --rereadpt /dev/$rootdev - local datapart=$(get_partition_by_name $rootdev "rootfs_data") + local datapart=$(find_mmc_part "rootfs_data" $rootdev) [ "$datapart" ] || return 0 - dd if=/dev/zero of=/dev/$datapart bs=4096 count=1 2>/dev/null + dd if=/dev/zero of=$datapart bs=4096 count=1 2>/dev/null echo $datapart > /tmp/sysupgrade.datapart ;; *) @@ -95,7 +95,7 @@ platform_copy_config_mmc() { [ -e "$UPGRADE_BACKUP" ] || return local datapart=$(cat /tmp/sysupgrade.datapart) [ "$datapart" ] || echo "no rootfs_data partition, cannot keep configuration." >&2 - dd if="$UPGRADE_BACKUP" of=/dev/$datapart + dd if="$UPGRADE_BACKUP" of=$datapart sync } -- 2.30.2