osguard: fix usr-a/b repart.d types to match image

[christopherco]

Merge Checklist

All boxes should be checked before merging the PR (just tick any boxes which don't apply to this PR)

• The toolchain has been rebuilt successfully (or no changes were made to it)
• The toolchain/worker package manifests are up-to-date
• Any updated packages successfully build (or no packages were changed)
• Packages depending on static components modified in this PR (Golang, *-static subpackages, etc.) have had their Release tag incremented.
• Package tests (%check section) have been verified with RUN_CHECK=y for existing SPEC files, or added to new SPEC files
• All package sources are available
• cgmanifest files are up-to-date and sorted (./cgmanifest.json, ./toolkit/scripts/toolchain/cgmanifest.json, .github/workflows/cgmanifest.json)
• LICENSE-MAP files are up-to-date (./LICENSES-AND-NOTICES/SPECS/data/licenses.json, ./LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md, ./LICENSES-AND-NOTICES/SPECS/LICENSE-EXCEPTIONS.PHOTON)
• All source files have up-to-date hashes in the *.signatures.json files
• sudo make go-tidy-all and sudo make go-test-coverage pass
• Documentation has been updated to match any changes to the build system
• Ready to merge

---

Summary

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]

Does this affect the toolchain?

NO

Associated issues

• https://dev.azure.com/mariner-org/mariner/_workitems/edit/14618

Test Methodology

• Pipeline build id: 895311