[openwrt/openwrt] mediatek: mt7623: make use of find_mmc_part
LEDE Commits
lede-commits at lists.infradead.org
Mon Nov 1 11:22:28 PDT 2021
dangole pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/b0703590359b876228d4603ca75af82ba87a6f5b
commit b0703590359b876228d4603ca75af82ba87a6f5b
Author: Daniel Golle <daniel at makrotopia.org>
AuthorDate: Mon Nov 1 14:03:25 2021 +0000
mediatek: mt7623: 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 <daniel at makrotopia.org>
---
.../linux/mediatek/mt7623/base-files/lib/upgrade/platform.sh | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/target/linux/mediatek/mt7623/base-files/lib/upgrade/platform.sh b/target/linux/mediatek/mt7623/base-files/lib/upgrade/platform.sh
index 11da6314dc..29c4bf1e03 100755
--- a/target/linux/mediatek/mt7623/base-files/lib/upgrade/platform.sh
+++ b/target/linux/mediatek/mt7623/base-files/lib/upgrade/platform.sh
@@ -89,13 +89,13 @@ platform_do_upgrade() {
blockdev --rereadpt /dev/$rootdev || return 1
export_partdevice fitpart 3
[ "$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
;;
@@ -175,7 +175,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
}
More information about the lede-commits
mailing list