particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

distro: harcode partuuids

Browse source 
We need to make partition uuids stable to be able to run image-info
tests on images using gpt. For example all aarch64 images use gpt.

Also change the type of the (part) UUID to string because that's what
the other UUIDs use and it is easier to work with.
This commit is contained in:
Martin Sehnoutka 2020-04-08 23:01:46 +02:00 • committed by Tom Gundersen
parent e887518736
commit 439b005514
4 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
internal/distro/fedora30/distro.go
View file

@ -699,6 +699,7 @@ func qemuAssembler(format string, filename string, uefi bool, size uint64) *osbu
Start: 2048,
Size: 972800,
Type: &fstype,
UUID: "02C1E068-1D2F-4DA3-91FD-8DD76A955C9D",
Filesystem: osbuild.QEMUFilesystem{
Type: "vfat",
UUID: "46BB-8120",
@ -708,6 +709,7 @@ func qemuAssembler(format string, filename string, uefi bool, size uint64) *osbu
},
{
Start: 976896,
UUID: "8D760010-FAAE-46D1-9E5B-4A2EAC5030CD",
Filesystem: osbuild.QEMUFilesystem{
Type: "ext4",
UUID: "76a22bf4-f153-4541-b6c7-0332c0dfaeac",

2
internal/distro/fedora31/distro.go
View file

@ -697,6 +697,7 @@ func qemuAssembler(format string, filename string, uefi bool, size uint64) *osbu
Start: 2048,
Size: 972800,
Type: &fstype,
UUID: "02C1E068-1D2F-4DA3-91FD-8DD76A955C9D",
Filesystem: osbuild.QEMUFilesystem{
Type: "vfat",
UUID: "46BB-8120",
@ -706,6 +707,7 @@ func qemuAssembler(format string, filename string, uefi bool, size uint64) *osbu
},
{
Start: 976896,
UUID: "8D760010-FAAE-46D1-9E5B-4A2EAC5030CD",
Filesystem: osbuild.QEMUFilesystem{
Type: "ext4",
UUID: "76a22bf4-f153-4541-b6c7-0332c0dfaeac",

2
internal/distro/fedora32/distro.go
View file

@ -699,6 +699,7 @@ func qemuAssembler(format string, filename string, uefi bool, size uint64) *osbu
Start: 2048,
Size: 972800,
Type: &fstype,
UUID: "02C1E068-1D2F-4DA3-91FD-8DD76A955C9D",
Filesystem: osbuild.QEMUFilesystem{
Type: "vfat",
UUID: "46BB-8120",
@ -708,6 +709,7 @@ func qemuAssembler(format string, filename string, uefi bool, size uint64) *osbu
},
{
Start: 976896,
UUID: "8D760010-FAAE-46D1-9E5B-4A2EAC5030CD",
Filesystem: osbuild.QEMUFilesystem{
Type: "ext4",
UUID: "76a22bf4-f153-4541-b6c7-0332c0dfaeac",

2
internal/osbuild/qemu_assembler.go
View file

@ -22,7 +22,7 @@ type QEMUPartition struct {
Size uint64 `json:"size,omitempty"`
Type *uuid.UUID `json:"type,omitempty"`
Bootable bool `json:"bootable,omitempty"`
UUID *uuid.UUID `json:"uuid,omitempty"`
UUID string `json:"uuid,omitempty"`
Filesystem QEMUFilesystem `json:"filesystem"`
}