diff options
| author | Álvaro Fernández Rojas | 2024-01-30 20:41:26 +0000 |
|---|---|---|
| committer | Álvaro Fernández Rojas | 2024-02-01 09:48:04 +0000 |
| commit | c82ca6dc743f382533693de4826747ec0ee16ce9 (patch) | |
| tree | a9e80644d68a6db16786d2ccd64098bcfdf0839e | |
| parent | 8a7f667fb53eb242b684e9c96124778bdee8b743 (diff) | |
| download | openwrt-c82ca6dc743f382533693de4826747ec0ee16ce9.tar.gz | |
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.
(cherry picked from commit a39176010299f3ad7d325b03d892fbf65e6dd23b)
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
| -rw-r--r-- | target/linux/bcm27xx/base-files/lib/preinit/79_move_config | 12 |
1 files changed, 8 insertions, 4 deletions
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 } |