From: Álvaro Fernández Rojas <noltari@gmail.com>
Date: Tue, 30 Jan 2024 20:41:26 +0000 (+0100)
Subject: bcm27xx: base-files: properly detect boot partition
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=a39176010299f3ad7d325b03d892fbf65e6dd23b;p=openwrt%2Fstaging%2F981213.git

bcm27xx: base-files: properly detect boot partition

Automatically detect boot partition instead of forcing /dev/mmcblk0p1.
This way users can still get /boot mounted when booting from USB.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
---

diff --git a/target/linux/bcm27xx/base-files/lib/preinit/79_move_config b/target/linux/bcm27xx/base-files/lib/preinit/79_move_config
index c9fb59a64f..db5bf93b62 100644
--- a/target/linux/bcm27xx/base-files/lib/preinit/79_move_config
+++ b/target/linux/bcm27xx/base-files/lib/preinit/79_move_config
@@ -2,16 +2,20 @@
 
 . /lib/upgrade/common.sh
 
-BOOTPART=/dev/mmcblk0p1
-
 move_config() {
-	if [ -b $BOOTPART ]; then
+	local partdev
+
+	export_bootdevice && export_partdevice partdev 1 || {
+		partdev=mmcblk0p1
+	}
+
+	if [ -b "/dev/$partdev" ]; then
 		insmod nls_cp437
 		insmod nls_iso8859-1
 		insmod fat
 		insmod vfat
 		mkdir -p /boot
-		mount -t vfat -o rw,noatime $BOOTPART /boot
+		mount -t vfat -o rw,noatime /dev/$partdev /boot
 		[ -f "/boot/$BACKUP_FILE" ] && mv -f "/boot/$BACKUP_FILE" /
 	fi
 }