diff mbox series

[isar-cip-core] wic/x86-uefi-efibootguard: correct the partition name

Message ID 20240718062455.9560-1-srinuvasan.a@siemens.com (mailing list archive)
State New
Headers show
Series [isar-cip-core] wic/x86-uefi-efibootguard: correct the partition name | expand

Commit Message

Arjunan, Srinu July 18, 2024, 6:24 a.m. UTC
From: Srinuvasan A <srinuvasan.a@siemens.com>

Use the correct partition name for partition B.

Signed-off-by: Srinuvasan A <srinuvasan.a@siemens.com>
---
 wic/x86-uefi-efibootguard.wks.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Felix Moessbauer July 18, 2024, 7:34 a.m. UTC | #1
On Thu, 2024-07-18 at 11:54 +0530, srinuvasan.a@siemens.com wrote:
> From: Srinuvasan A <srinuvasan.a@siemens.com>
> 
> Use the correct partition name for partition B.

Wow... I'm surprised how that could stay undetected.
Thanks for this fix!

Anyways, I really recommend to not rely on partition labels, as they
are not unique. Further, when building products, make sure to use fresh
UUIDs for the partitions and not the default ones from CIP.
IIRC, Quirin wanted to add a note about this to the docs.

Felix

> 
> Signed-off-by: Srinuvasan A <srinuvasan.a@siemens.com>
> ---
>  wic/x86-uefi-efibootguard.wks.in | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/wic/x86-uefi-efibootguard.wks.in b/wic/x86-uefi-
> efibootguard.wks.in
> index 4c0484f..a1cebc1 100644
> --- a/wic/x86-uefi-efibootguard.wks.in
> +++ b/wic/x86-uefi-efibootguard.wks.in
> @@ -4,7 +4,7 @@
>  include ebg-sysparts.inc
>  
>  part --source rawcopy --sourceparams
> "file=${IMAGE_FULLNAME}.squashfs" --align 1024 --fixed-size 1G --uuid
> "${ABROOTFS_PART_UUID_A}" --part-type 0FC63DAF-8483-4772-8E79-
> 3D69D8477DE4 --part-name systema
> -part --source empty --align 1024 --fixed-size 1G --uuid
> "${ABROOTFS_PART_UUID_B}" --part-type 0FC63DAF-8483-4772-8E79-
> 3D69D8477DE4 --part-name systema
> +part --source empty --align 1024 --fixed-size 1G --uuid
> "${ABROOTFS_PART_UUID_B}" --part-type 0FC63DAF-8483-4772-8E79-
> 3D69D8477DE4 --part-name systemb
>  
>  # home and var are extra partitions
>
Jan Kiszka July 18, 2024, 7:36 a.m. UTC | #2
On 18.07.24 08:24, srinuvasan.a@siemens.com wrote:
> From: Srinuvasan A <srinuvasan.a@siemens.com>
> 
> Use the correct partition name for partition B.
> 
> Signed-off-by: Srinuvasan A <srinuvasan.a@siemens.com>
> ---
>  wic/x86-uefi-efibootguard.wks.in | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/wic/x86-uefi-efibootguard.wks.in b/wic/x86-uefi-efibootguard.wks.in
> index 4c0484f..a1cebc1 100644
> --- a/wic/x86-uefi-efibootguard.wks.in
> +++ b/wic/x86-uefi-efibootguard.wks.in
> @@ -4,7 +4,7 @@
>  include ebg-sysparts.inc
>  
>  part --source rawcopy --sourceparams "file=${IMAGE_FULLNAME}.squashfs" --align 1024 --fixed-size 1G --uuid "${ABROOTFS_PART_UUID_A}" --part-type 0FC63DAF-8483-4772-8E79-3D69D8477DE4 --part-name systema
> -part --source empty --align 1024 --fixed-size 1G --uuid "${ABROOTFS_PART_UUID_B}" --part-type 0FC63DAF-8483-4772-8E79-3D69D8477DE4 --part-name systema
> +part --source empty --align 1024 --fixed-size 1G --uuid "${ABROOTFS_PART_UUID_B}" --part-type 0FC63DAF-8483-4772-8E79-3D69D8477DE4 --part-name systemb
>  
>  # home and var are extra partitions
>  

Thanks, applied. We are not relying on the names (for good reasons), so
this remained unnoticed so far.

Jan
Gylstorff Quirin July 23, 2024, 8:59 a.m. UTC | #3
On 7/18/24 9:34 AM, Moessbauer, Felix (T CED OES-DE) wrote:
> On Thu, 2024-07-18 at 11:54 +0530, srinuvasan.a@siemens.com wrote:
>> From: Srinuvasan A <srinuvasan.a@siemens.com>
>>
>> Use the correct partition name for partition B.
> 
> Wow... I'm surprised how that could stay undetected.
> Thanks for this fix!

We don't use the partition names anywhere :-D.
Quirin
> 
> Anyways, I really recommend to not rely on partition labels, as they
> are not unique. Further, when building products, make sure to use fresh
> UUIDs for the partitions and not the default ones from CIP.
> IIRC, Quirin wanted to add a note about this to the docs.
> 
> Felix
> 
>>
>> Signed-off-by: Srinuvasan A <srinuvasan.a@siemens.com>
>> ---
>>   wic/x86-uefi-efibootguard.wks.in | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/wic/x86-uefi-efibootguard.wks.in b/wic/x86-uefi-
>> efibootguard.wks.in
>> index 4c0484f..a1cebc1 100644
>> --- a/wic/x86-uefi-efibootguard.wks.in
>> +++ b/wic/x86-uefi-efibootguard.wks.in
>> @@ -4,7 +4,7 @@
>>   include ebg-sysparts.inc
>>   
>>   part --source rawcopy --sourceparams
>> "file=${IMAGE_FULLNAME}.squashfs" --align 1024 --fixed-size 1G --uuid
>> "${ABROOTFS_PART_UUID_A}" --part-type 0FC63DAF-8483-4772-8E79-
>> 3D69D8477DE4 --part-name systema
>> -part --source empty --align 1024 --fixed-size 1G --uuid
>> "${ABROOTFS_PART_UUID_B}" --part-type 0FC63DAF-8483-4772-8E79-
>> 3D69D8477DE4 --part-name systema
>> +part --source empty --align 1024 --fixed-size 1G --uuid
>> "${ABROOTFS_PART_UUID_B}" --part-type 0FC63DAF-8483-4772-8E79-
>> 3D69D8477DE4 --part-name systemb
>>   
>>   # home and var are extra partitions
>>   
>
diff mbox series

Patch

diff --git a/wic/x86-uefi-efibootguard.wks.in b/wic/x86-uefi-efibootguard.wks.in
index 4c0484f..a1cebc1 100644
--- a/wic/x86-uefi-efibootguard.wks.in
+++ b/wic/x86-uefi-efibootguard.wks.in
@@ -4,7 +4,7 @@ 
 include ebg-sysparts.inc
 
 part --source rawcopy --sourceparams "file=${IMAGE_FULLNAME}.squashfs" --align 1024 --fixed-size 1G --uuid "${ABROOTFS_PART_UUID_A}" --part-type 0FC63DAF-8483-4772-8E79-3D69D8477DE4 --part-name systema
-part --source empty --align 1024 --fixed-size 1G --uuid "${ABROOTFS_PART_UUID_B}" --part-type 0FC63DAF-8483-4772-8E79-3D69D8477DE4 --part-name systema
+part --source empty --align 1024 --fixed-size 1G --uuid "${ABROOTFS_PART_UUID_B}" --part-type 0FC63DAF-8483-4772-8E79-3D69D8477DE4 --part-name systemb
 
 # home and var are extra partitions