From: Yonghyu Ban <yhban@silicon.moe>
Date: Wed, 19 Mar 2025 08:11:54 +0000 (+0900)
Subject: mediatek: allow mounting ubifs by its device and partition name
X-Git-Tag: v25.12.0-rc1~2021
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8754f38665b723686a9b0de3175af1aa9ca983c;p=thirdparty%2Fopenwrt.git

mediatek: allow mounting ubifs by its device and partition name

Since not every device sets an ubifs partition name as the same as their
parent mtd partition, this change allows mount_ubi_part to usable in
other devices

Signed-off-by: Yonghyu Ban <yhban@silicon.moe>
Link: https://github.com/openwrt/openwrt/pull/19203
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---

diff --git a/target/linux/mediatek/filogic/base-files/lib/preinit/09_mount_cfg_part b/target/linux/mediatek/filogic/base-files/lib/preinit/09_mount_cfg_part
index 87e51a44294..ddbb1d12937 100644
--- a/target/linux/mediatek/filogic/base-files/lib/preinit/09_mount_cfg_part
+++ b/target/linux/mediatek/filogic/base-files/lib/preinit/09_mount_cfg_part
@@ -1,13 +1,14 @@
 . /lib/functions/system.sh
 
 mount_ubi_part() {
-	local part_name="$1"
-	local mtd_num=$(grep $part_name /proc/mtd | cut -c4)
+	local mtd_name="$1"
+	local part_name="$2"
+	local mtd_num=$(grep \"$mtd_name\" /proc/mtd | cut -d: -f1 | sed 's/mtd//g')
 	local ubi_num=$(ubiattach -m $mtd_num | \
 		awk -F',' '/UBI device number [0-9]{1,}/{print $1}' | \
 		awk '{print $4}')
-	mkdir /tmp/$part_name
-	mount -r -t ubifs ubi$ubi_num:$part_name /tmp/$part_name
+	mkdir /tmp/$mtd_name
+	mount -r -t ubifs ubi$ubi_num:$part_name /tmp/$mtd_name
 }
 
 preinit_mount_cfg_part() {
@@ -16,7 +17,7 @@ preinit_mount_cfg_part() {
 	mercusys,mr90x-v1|\
 	tplink,archer-ax80-v1|\
 	tplink,re6000xd)
-		mount_ubi_part "tp_data"
+		mount_ubi_part "tp_data" "tp_data"
 		;;
 	*)
 		;;