diff mbox series

[master/scarthgap/kirkstone] wic: prevent boot FAT partition mounting under /boot

Message ID 20240421191458.2221303-1-denis@denix.org
State Under Review
Delegated to: Ryan Eatmon
Headers show
Series [master/scarthgap/kirkstone] wic: prevent boot FAT partition mounting under /boot | expand

Commit Message

Denys Dmytriyenko April 21, 2024, 7:14 p.m. UTC 
From: Denys Dmytriyenko <denys@konsulko.com>

Separate FAT boot partition holds SPL, SYSFW and U-boot images, while
rootfs places kernel images and DTBs into /boot directory. So it is not
desirable to mount boot FAT partition into /boot directory of the rootfs
and shadow its original content - adjust corresponding entry in wic
templates.

While at it, remove unused ondisk parameter when using use-uuid, which
takes precedence and is more flexible.

Note: boot FAT partition will be automounted at /run/media/boot-mmcblk0p1/

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/wic/sdimage-2part-efi.wks.in | 3 ++-
 meta-ti-bsp/wic/sdimage-2part.wks        | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/meta-ti-bsp/wic/sdimage-2part-efi.wks.in b/meta-ti-bsp/wic/sdimage-2part-efi.wks.in
index 2213a348..bcd08a62 100644
--- a/meta-ti-bsp/wic/sdimage-2part-efi.wks.in
+++ b/meta-ti-bsp/wic/sdimage-2part-efi.wks.in
@@ -2,6 +2,7 @@ 
 # long-description: Creates a partitioned SD card image for TI platforms that
 # supports EFI.  Boot files are located in the first vfat partition with extra
 # reserved space.  We cannot use a GPT here.
+
 bootloader --timeout=3 --append="rootfstype=ext4"
-part /boot --source bootimg-efi --sourceparams="loader=${EFI_PROVIDER}" --fstype=vfat --label boot --active --align 1024 --use-uuid --fixed-size 128M
+part boot --source bootimg-efi --sourceparams="loader=${EFI_PROVIDER}" --fstype=vfat --label boot --active --align 1024 --use-uuid --fixed-size 128M
 part / --source rootfs --fstype=ext4 --label root --align 1024 --use-uuid
diff --git a/meta-ti-bsp/wic/sdimage-2part.wks b/meta-ti-bsp/wic/sdimage-2part.wks
index 3eab9407..247002a0 100644
--- a/meta-ti-bsp/wic/sdimage-2part.wks
+++ b/meta-ti-bsp/wic/sdimage-2part.wks
@@ -2,5 +2,5 @@ 
 # long-description: Creates a partitioned SD card image for TI platforms.
 # Boot files are located in the first vfat partition with extra reserved space.
 
-part /boot --source bootimg-partition --ondisk mmcblk0 --fstype=vfat --label boot --active --align 1024 --fixed-size 128 --use-uuid
-part / --source rootfs --ondisk mmcblk0 --fstype=ext4 --label root --align 1024 --use-uuid
+part boot --source bootimg-partition --fstype=vfat --label boot --active --align 1024 --use-uuid --fixed-size 128
+part / --source rootfs --fstype=ext4 --label root --align 1024 --use-uuid