From c70b7c87f519961004c09d2e7469e8b99667c774 Mon Sep 17 00:00:00 2001
From: Jan Kiszka <jan.kiszka@siemens.com>
Date: Wed, 6 Mar 2024 22:04:22 +0100
Subject: [PATCH] swupdate: Set partition types for squashfs root partitions

This avoids that EFI Boot Guard tools try to mount them as EFI
partitions.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 wic/iot2050-swu-secure.wks.in | 4 ++--
 wic/iot2050-swu.wks.in        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/wic/iot2050-swu-secure.wks.in b/wic/iot2050-swu-secure.wks.in
index 14183f776..15804802c 100644
--- a/wic/iot2050-swu-secure.wks.in
+++ b/wic/iot2050-swu-secure.wks.in
@@ -10,8 +10,8 @@
 
 include ebg-signed-sysparts.inc
 
-part --source rawcopy --sourceparams "file=${IMAGE_FULLNAME}.verity" --align 1024 --fixed-size 4G --uuid "${ABROOTFS_PART_UUID_A}"
-part --source empty --align 1024 --fixed-size 4G --uuid "${ABROOTFS_PART_UUID_B}"
+part --source rawcopy --sourceparams "file=${IMAGE_FULLNAME}.verity" --align 1024 --fixed-size 4G --uuid "${ABROOTFS_PART_UUID_A}" --part-type 0FC63DAF-8483-4772-8E79-3D69D8477DE4
+part --source empty --align 1024 --fixed-size 4G --uuid "${ABROOTFS_PART_UUID_B}" --part-type 0FC63DAF-8483-4772-8E79-3D69D8477DE4
 
 # persistent partitions
 part /var --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/var --label var --fstype=ext4 --mkfs-extraopts "-T default" --align 1024  --size 512M
diff --git a/wic/iot2050-swu.wks.in b/wic/iot2050-swu.wks.in
index bb9ec4acf..4fb7faf66 100644
--- a/wic/iot2050-swu.wks.in
+++ b/wic/iot2050-swu.wks.in
@@ -10,8 +10,8 @@
 
 include ebg-sysparts.inc
 
-part --source rawcopy --sourceparams "file=${IMAGE_FULLNAME}.squashfs" --align 1024 --fixed-size 4G --uuid "${ABROOTFS_PART_UUID_A}"
-part --source empty --align 1024 --fixed-size 4G --uuid "${ABROOTFS_PART_UUID_B}"
+part --source rawcopy --sourceparams "file=${IMAGE_FULLNAME}.squashfs" --align 1024 --fixed-size 4G --uuid "${ABROOTFS_PART_UUID_A}" --part-type 0FC63DAF-8483-4772-8E79-3D69D8477DE4
+part --source empty --align 1024 --fixed-size 4G --uuid "${ABROOTFS_PART_UUID_B}" --part-type 0FC63DAF-8483-4772-8E79-3D69D8477DE4
 
 # persistent partitions
 part /var --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/var --label var --fstype=ext4 --mkfs-extraopts "-T default" --ondisk sda --align 1024  --size 512M