wic: rename /home partition label in multipart-efi.wks

Message ID 20251101054939.3356150-1-cedric.hombourger@siemens.com
State Accepted, archived
Headers show
Series wic: rename /home partition label in multipart-efi.wks | expand

Commit Message

Cedric Hombourger Nov. 1, 2025, 5:49 a.m. UTC
Both the root file-system and /home partitions were assigned
"platform" as their PARTLABEL. Boot of the image may fail
if the kernel command line uses root=PARTLABEL=platform as
both would match this criteria. Rename the latter to "home"

Signed-off-by: Cedric Hombourger <cedric.hombourger@siemens.com>
---
 meta-isar/scripts/lib/wic/canned-wks/multipart-efi.wks | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Zhihang Wei Nov. 4, 2025, 2:19 p.m. UTC | #1
Applied to next, thanks.

Best regards,
Zhihang

On 11/1/25 06:49, 'Cedric Hombourger' via isar-users wrote:
> Both the root file-system and /home partitions were assigned
> "platform" as their PARTLABEL. Boot of the image may fail
> if the kernel command line uses root=PARTLABEL=platform as
> both would match this criteria. Rename the latter to "home"
>
> Signed-off-by: Cedric Hombourger <cedric.hombourger@siemens.com>
> ---
>   meta-isar/scripts/lib/wic/canned-wks/multipart-efi.wks | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta-isar/scripts/lib/wic/canned-wks/multipart-efi.wks b/meta-isar/scripts/lib/wic/canned-wks/multipart-efi.wks
> index b3abb3d0..a9745edd 100644
> --- a/meta-isar/scripts/lib/wic/canned-wks/multipart-efi.wks
> +++ b/meta-isar/scripts/lib/wic/canned-wks/multipart-efi.wks
> @@ -3,6 +3,6 @@ part /boot --ondisk sda --source bootimg-efi-isar --sourceparams="loader=grub-ef
>   # when excluding paths, just specify --exclude-path once and separate paths using spaces
>   part /     --ondisk sda --source rootfs --fstype=ext4 --mkfs-extraopts "-T default" --label platform --align 1024 --exclude-path boot home --extra-space 1G
>   # put home last to support auto-expand of this partition
> -part /home --ondisk sda --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/home --fstype=ext4 --mkfs-extraopts "-T default" --label platform --align 1024
> +part /home --ondisk sda --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/home --fstype=ext4 --mkfs-extraopts "-T default" --label home --align 1024
>   
>   bootloader --ptable gpt --timeout 3 --append "rootwait console=ttyS0,115200 console=tty0"

Patch

diff --git a/meta-isar/scripts/lib/wic/canned-wks/multipart-efi.wks b/meta-isar/scripts/lib/wic/canned-wks/multipart-efi.wks
index b3abb3d0..a9745edd 100644
--- a/meta-isar/scripts/lib/wic/canned-wks/multipart-efi.wks
+++ b/meta-isar/scripts/lib/wic/canned-wks/multipart-efi.wks
@@ -3,6 +3,6 @@  part /boot --ondisk sda --source bootimg-efi-isar --sourceparams="loader=grub-ef
 # when excluding paths, just specify --exclude-path once and separate paths using spaces
 part /     --ondisk sda --source rootfs --fstype=ext4 --mkfs-extraopts "-T default" --label platform --align 1024 --exclude-path boot home --extra-space 1G
 # put home last to support auto-expand of this partition
-part /home --ondisk sda --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/home --fstype=ext4 --mkfs-extraopts "-T default" --label platform --align 1024
+part /home --ondisk sda --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/home --fstype=ext4 --mkfs-extraopts "-T default" --label home --align 1024
 
 bootloader --ptable gpt --timeout 3 --append "rootwait console=ttyS0,115200 console=tty0"