osguard: fix usr-a/b repart.d types to match image (#14470)

To avoid mismatch of partition type information between original
partitioning and repart.d configuration, this change updates the
repart.d generation script for osguard to use the type already present
rather than overwriting the partition type information.

The change also regenerates the osguard repart.d files so the usr-a/b
type information matches what is present in the osguard image, so
systemd-repartd is successful.

Signed-off-by: Chris Co <[email protected]>

Author: christopherco

toolkit/imageconfigs/files/osguard/repart.d/12-usr-a.conf

@@ -1,5 +1,5 @@
 [Partition]
-Type=usr
+Type=linux-generic
 Label=usr-a
 SizeMinBytes=1G
 SizeMaxBytes=1G

toolkit/imageconfigs/files/osguard/repart.d/16-usr-b.conf

@@ -1,5 +1,5 @@
 [Partition]
-Type=usr
+Type=linux-generic
 Label=usr-b
 SizeMinBytes=1G
 SizeMaxBytes=1G

toolkit/scripts/generate-repartd.sh

@@ -12,14 +12,7 @@ rm -f "$REPART_DIR"/*.conf
 
 emit_partition() {
     local num="$1" part="$2" type="$3" label="$4" size="$5"
-    # Set Type for root and root-hash partitions
-    if [[ "$part" =~ ^usr-(a|b)$ ]]; then
-        type_out="usr"
-    elif [[ "$part" =~ ^usr-hash-(a|b)$ ]]; then
-        type_out="usr-verity"
-    else
-        type_out="$type"
-    fi
+    type_out="$type"
 
     # Ensure label is never null
     if [[ -z "$label" || "$label" == "null" ]]; then