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

osbuild: Change QEMUPartition "Type" to match osbuild

Browse source 
Partition type, as defined in osbuild qemu assembler, is of type string
because it is either UUID or identifier. See here for details:
162797f206/assemblers/org.osbuild.qemu (L88)

Change type of the "Type" struct member to match the definition in
osbuild. This patch is needed for ppc64le support.
This commit is contained in:
Martin Sehnoutka 2020-06-05 09:42:57 +02:00 • committed by Tom Gundersen
parent 38e4fe8781
commit 673e967b2d
4 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -635,7 +635,6 @@ func (r *imageType) selinuxStageOptions() *osbuild.SELinuxStageOptions {
func qemuAssembler(format string, filename string, uefi bool, size uint64) *osbuild.Assembler {
var options osbuild.QEMUAssemblerOptions
if uefi {
fstype := uuid.MustParse("C12A7328-F81F-11D2-BA4B-00A0C93EC93B")
options = osbuild.QEMUAssemblerOptions{
Format: format,
Filename: filename,
@ -646,7 +645,7 @@ func qemuAssembler(format string, filename string, uefi bool, size uint64) *osbu
{
Start: 2048,
Size: 972800,
Type: &fstype,
Type: "c12a7328-f81f-11d2-ba4b-00a0c93ec93b",
UUID: "02C1E068-1D2F-4DA3-91FD-8DD76A955C9D",
Filesystem: osbuild.QEMUFilesystem{
Type: "vfat",

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

@ -481,7 +481,6 @@ func (t *imageType) selinuxStageOptions() *osbuild.SELinuxStageOptions {
func qemuAssembler(format string, filename string, uefi bool, imageOptions distro.ImageOptions) *osbuild.Assembler {
var options osbuild.QEMUAssemblerOptions
if uefi {
fstype := uuid.MustParse("C12A7328-F81F-11D2-BA4B-00A0C93EC93B")
options = osbuild.QEMUAssemblerOptions{
Format: format,
Filename: filename,
@ -492,7 +491,7 @@ func qemuAssembler(format string, filename string, uefi bool, imageOptions distr
{
Start: 2048,
Size: 972800,
Type: &fstype,
Type: "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
UUID: "02C1E068-1D2F-4DA3-91FD-8DD76A955C9D",
Filesystem: osbuild.QEMUFilesystem{
Type: "vfat",

3
internal/distro/rhel8/distro.go
View file

@ -488,7 +488,6 @@ func (t *imageType) selinuxStageOptions() *osbuild.SELinuxStageOptions {
func qemuAssembler(format string, filename string, uefi bool, imageOptions distro.ImageOptions) *osbuild.Assembler {
var options osbuild.QEMUAssemblerOptions
if uefi {
fstype := uuid.MustParse("C12A7328-F81F-11D2-BA4B-00A0C93EC93B")
options = osbuild.QEMUAssemblerOptions{
Format: format,
Filename: filename,
@ -499,7 +498,7 @@ func qemuAssembler(format string, filename string, uefi bool, imageOptions distr
{
Start: 2048,
Size: 972800,
Type: &fstype,
Type: "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
Filesystem: osbuild.QEMUFilesystem{
Type: "vfat",
UUID: "46BB-8120",

4
internal/osbuild/qemu_assembler.go
View file

@ -1,7 +1,5 @@
package osbuild
import "github.com/google/uuid"
// QEMUAssemblerOptions desrcibe how to assemble a tree into an image using qemu.
//
// The assembler creates an image of the given size, adds a GRUB2 bootloader
@ -21,7 +19,7 @@ type QEMUAssemblerOptions struct {
type QEMUPartition struct {
Start uint64 `json:"start"`
Size uint64 `json:"size,omitempty"`
Type *uuid.UUID `json:"type,omitempty"`
Type string `json:"type,omitempty"`
Bootable bool `json:"bootable,omitempty"`
UUID string `json:"uuid,omitempty"`
Filesystem QEMUFilesystem `json:"filesystem"`