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

distro/rhel84: build qcow2 images with compat=0.10

Browse source 
By default, `qemu-img convert` creates qcow2 images usable in qemu 1.1 and
newer. RHEL 8 guest images are meant to be bootable on RHEL 6 though.
Unfortunately, RHEL 6 has qemu 0.12, therefore these images cannot be used
there.

To fix this, we need to use the new qcow2_compat option in qemu assembler
to override the default compat version and make qcow2 images that can be used
in qemu 0.10 and newer.

For this, we need osbuild 28 that isn't yet available in of any of
downstreams, therefore we need to pin it everywhere.

Signed-off-by: Ondřej Budai <ondrej@budai.cz>
This commit is contained in:
Ondřej Budai 2021-04-08 10:36:58 +02:00 • committed by Tom Gundersen
parent 5937b9adca
commit 973b4b2714
12 changed files with 67 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Schutzfile
View file

@ -1,5 +1,17 @@
{
"fedora-32": {
"dependencies": {
"osbuild": {
"commit": "eb74ddf2ef8c203b5d354dfb97adee65babdc147"
}
}
},
"fedora-33": {
"dependencies": {
"osbuild": {
"commit": "eb74ddf2ef8c203b5d354dfb97adee65babdc147"
}
},
"dependants": {
"koji-osbuild": {
"commit": "4fdc457745e1147475ea3ac1e3b073e592d7b174"
@ -9,7 +21,7 @@
"rhel-8.3": {
"dependencies": {
"osbuild": {
"commit": "e4e527b5b7cdf8bb6e48a6ec3ace7d9d9b155bc0"
"commit": "eb74ddf2ef8c203b5d354dfb97adee65babdc147"
}
},
"dependants": {
@ -21,10 +33,17 @@
}
}
},
"rhel-8.4": {
"dependencies": {
"osbuild": {
"commit": "eb74ddf2ef8c203b5d354dfb97adee65babdc147"
}
}
},
"centos-8": {
"dependencies": {
"osbuild": {
"commit": "e4e527b5b7cdf8bb6e48a6ec3ace7d9d9b155bc0"
"commit": "eb74ddf2ef8c203b5d354dfb97adee65babdc147"
}
}
}

6
docs/news/unreleased/rhel84-qcow2-compat.md Normal file
View file

@ -0,0 +1,6 @@
# RHEL 8.4: qcow2 images can now be used by older QEMUs
Previously, the guest image for RHEL 8.4 was only usable by QEMU 1.1 and
newer. However, this image should be usable on RHEL 6 that ships an older
version of QEMU. This is now fixed and the guest image can be now used by
QEMU 0.10 and newer.

15
internal/distro/rhel84/distro.go
View file

@ -742,11 +742,12 @@ func defaultPartitionTable(imageOptions distro.ImageOptions, arch distro.Arch, r
panic("unknown arch: " + arch.Name())
}
func qemuAssembler(pt *disk.PartitionTable, format string, filename string, imageOptions distro.ImageOptions, arch distro.Arch) *osbuild.Assembler {
func qemuAssembler(pt *disk.PartitionTable, format string, filename string, imageOptions distro.ImageOptions, arch distro.Arch, qcow2Compat string) *osbuild.Assembler {
options := pt.QEMUAssemblerOptions()
options.Format = format
options.Filename = filename
options.Qcow2Compat = qcow2Compat
if arch.Name() == "x86_64" {
options.Bootloader = &osbuild.QEMUBootloader{
@ -1002,7 +1003,7 @@ func newDistro(isCentos bool) distro.Distro {
defaultSize: 6 * GigaByte,
partitionTableGenerator: defaultPartitionTable,
assembler: func(pt *disk.PartitionTable, options distro.ImageOptions, arch distro.Arch) *osbuild.Assembler {
return qemuAssembler(pt, "raw", "image.raw", options, arch)
return qemuAssembler(pt, "raw", "image.raw", options, arch, "")
},
}
@ -1087,7 +1088,9 @@ func newDistro(isCentos bool) distro.Distro {
defaultSize: 10 * GigaByte,
partitionTableGenerator: defaultPartitionTable,
assembler: func(pt *disk.PartitionTable, options distro.ImageOptions, arch distro.Arch) *osbuild.Assembler {
return qemuAssembler(pt, "qcow2", "disk.qcow2", options, arch)
// guest images of RHEL 8 must be bootable with older QEMUs.
const qcow2Compat = "0.10"
return qemuAssembler(pt, "qcow2", "disk.qcow2", options, arch, qcow2Compat)
},
}
@ -1115,7 +1118,7 @@ func newDistro(isCentos bool) distro.Distro {
defaultSize: 4 * GigaByte,
partitionTableGenerator: defaultPartitionTable,
assembler: func(pt *disk.PartitionTable, options distro.ImageOptions, arch distro.Arch) *osbuild.Assembler {
return qemuAssembler(pt, "qcow2", "disk.qcow2", options, arch)
return qemuAssembler(pt, "qcow2", "disk.qcow2", options, arch, "")
},
}
@ -1174,7 +1177,7 @@ func newDistro(isCentos bool) distro.Distro {
defaultSize: 4 * GigaByte,
partitionTableGenerator: defaultPartitionTable,
assembler: func(pt *disk.PartitionTable, options distro.ImageOptions, arch distro.Arch) *osbuild.Assembler {
return qemuAssembler(pt, "vpc", "disk.vhd", options, arch)
return qemuAssembler(pt, "vpc", "disk.vhd", options, arch, "")
},
}
@ -1203,7 +1206,7 @@ func newDistro(isCentos bool) distro.Distro {
defaultSize: 4 * GigaByte,
partitionTableGenerator: defaultPartitionTable,
assembler: func(pt *disk.PartitionTable, options distro.ImageOptions, arch distro.Arch) *osbuild.Assembler {
return qemuAssembler(pt, "vmdk", "disk.vmdk", options, arch)
return qemuAssembler(pt, "vmdk", "disk.vmdk", options, arch, "")
},
}

15
internal/osbuild1/qemu_assembler.go
View file

@ -7,13 +7,14 @@ package osbuild1
// containing the indicated partitions. Finally, the image is converted into
// the target format and stored with the given filename.
type QEMUAssemblerOptions struct {
Bootloader *QEMUBootloader `json:"bootloader,omitempty"`
Format string `json:"format"`
Filename string `json:"filename"`
Size uint64 `json:"size"`
PTUUID string `json:"ptuuid"`
PTType string `json:"pttype"`
Partitions []QEMUPartition `json:"partitions"`
Bootloader *QEMUBootloader `json:"bootloader,omitempty"`
Format string `json:"format"`
Qcow2Compat string `json:"qcow2_compat,omitempty"`
Filename string `json:"filename"`
Size uint64 `json:"size"`
PTUUID string `json:"ptuuid"`
PTType string `json:"pttype"`
Partitions []QEMUPartition `json:"partitions"`
}
type QEMUPartition struct {

4
osbuild-composer.spec
View file

@ -273,8 +273,8 @@ The core osbuild-composer binary. This is suitable both for spawning in containe
Summary: The worker for osbuild-composer
Requires: systemd
Requires: qemu-img
Requires: osbuild >= 26
Requires: osbuild-ostree >= 26
Requires: osbuild >= 28
Requires: osbuild-ostree >= 28
# remove in F34
Obsoletes: golang-github-osbuild-composer-worker < %{version}-%{release}

5
test/data/manifests/centos_8-x86_64-qcow2-boot.json
View file

@ -4208,6 +4208,7 @@
"type": "grub2"
},
"format": "qcow2",
"qcow2_compat": "0.10",
"filename": "disk.qcow2",
"size": 10737418240,
"ptuuid": "D209C89E-EA5E-4FBD-B161-B461CCE297E0",
@ -11031,8 +11032,8 @@
"wheel:x:10:"
],
"image-format": {
"type": "qcow2",
"compat": "1.1"
"compat": "0.10",
"type": "qcow2"
},
"os-release": {
"ANSI_COLOR": "0;31",

5
test/data/manifests/centos_8-x86_64-qcow2-customize.json
View file

@ -4309,6 +4309,7 @@
"type": "grub2"
},
"format": "qcow2",
"qcow2_compat": "0.10",
"filename": "disk.qcow2",
"size": 10737418240,
"ptuuid": "D209C89E-EA5E-4FBD-B161-B461CCE297E0",
@ -11125,8 +11126,8 @@
],
"hostname": "my-host",
"image-format": {
"type": "qcow2",
"compat": "1.1"
"compat": "0.10",
"type": "qcow2"
},
"os-release": {
"ANSI_COLOR": "0;31",

5
test/data/manifests/rhel_84-aarch64-qcow2-boot.json
View file

@ -3470,6 +3470,7 @@
"name": "org.osbuild.qemu",
"options": {
"format": "qcow2",
"qcow2_compat": "0.10",
"filename": "disk.qcow2",
"size": 10737418240,
"ptuuid": "D209C89E-EA5E-4FBD-B161-B461CCE297E0",
@ -9473,8 +9474,8 @@
"wheel:x:10:"
],
"image-format": {
"type": "qcow2",
"compat": "1.1"
"compat": "0.10",
"type": "qcow2"
},
"os-release": {
"ANSI_COLOR": "0;31",

5
test/data/manifests/rhel_84-ppc64le-qcow2-boot.json
View file

@ -3753,6 +3753,7 @@
"platform": "powerpc-ieee1275"
},
"format": "qcow2",
"qcow2_compat": "0.10",
"filename": "disk.qcow2",
"size": 10737418240,
"ptuuid": "0x14fc63d2",
@ -10200,8 +10201,8 @@
"wheel:x:10:"
],
"image-format": {
"type": "qcow2",
"compat": "1.1"
"compat": "0.10",
"type": "qcow2"
},
"os-release": {
"ANSI_COLOR": "0;31",

5
test/data/manifests/rhel_84-s390x-qcow2-boot.json
View file

@ -3694,6 +3694,7 @@
"type": "zipl"
},
"format": "qcow2",
"qcow2_compat": "0.10",
"filename": "disk.qcow2",
"size": 10737418240,
"ptuuid": "0x14fc63d2",
@ -10132,8 +10133,8 @@
"zkeyadm:x:996:"
],
"image-format": {
"type": "qcow2",
"compat": "1.1"
"compat": "0.10",
"type": "qcow2"
},
"os-release": {
"ANSI_COLOR": "0;31",

5
test/data/manifests/rhel_84-x86_64-qcow2-boot.json
View file

@ -3520,6 +3520,7 @@
"type": "grub2"
},
"format": "qcow2",
"qcow2_compat": "0.10",
"filename": "disk.qcow2",
"size": 10737418240,
"ptuuid": "D209C89E-EA5E-4FBD-B161-B461CCE297E0",
@ -9611,8 +9612,8 @@
"wheel:x:10:"
],
"image-format": {
"type": "qcow2",
"compat": "1.1"
"compat": "0.10",
"type": "qcow2"
},
"os-release": {
"ANSI_COLOR": "0;31",

5
test/data/manifests/rhel_84-x86_64-qcow2-customize.json
View file

@ -3622,6 +3622,7 @@
"type": "grub2"
},
"format": "qcow2",
"qcow2_compat": "0.10",
"filename": "disk.qcow2",
"size": 10737418240,
"ptuuid": "D209C89E-EA5E-4FBD-B161-B461CCE297E0",
@ -9707,8 +9708,8 @@
],
"hostname": "my-host",
"image-format": {
"type": "qcow2",
"compat": "1.1"
"compat": "0.10",
"type": "qcow2"
},
"os-release": {
"ANSI_COLOR": "0;31",