From: Denys Dmytriyenko <denis@denix.org>
To: meta-ti@lists.yoctoproject.org
Cc: Denys Dmytriyenko <denys@konsulko.com>
Subject: [master/scarthgap/kirkstone][PATCH v2] wic: prevent boot FAT partition mounting under /boot
Date: Wed, 24 Apr 2024 18:36:24 -0400 [thread overview]
Message-ID: <20240424223624.1938639-1-denis@denix.org> (raw)
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>
---
v2 changes:
* remove <mountpoint> from boot partition to avoid undocumented behavior
* add explicit size specifier to --fixed-size 128M
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 --git a/meta-ti-bsp/wic/sdimage-2part-efi.wks.in b/meta-ti-bsp/wic/sdimage-2part-efi.wks.in
index 2213a348..ca042be1 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 --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..5073176e 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 --source bootimg-partition --fstype=vfat --label boot --active --align 1024 --use-uuid --fixed-size 128M
+part / --source rootfs --fstype=ext4 --label root --align 1024 --use-uuid
--
2.25.1
next reply other threads:[~2024-04-24 22:36 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-24 22:36 Denys Dmytriyenko [this message]
2024-04-24 22:46 ` [meta-ti] [master/scarthgap/kirkstone][PATCH v2] wic: prevent boot FAT partition mounting under /boot Jon Cormier
2024-04-26 19:02 ` Denys Dmytriyenko
2024-04-26 21:07 ` Ryan Eatmon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240424223624.1938639-1-denis@denix.org \
--to=denis@denix.org \
--cc=denys@konsulko.com \
--cc=meta-ti@lists.yoctoproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).