blueprint: move vmdk towards lorax parity

The main difference (according to image-info) is an additional package
containing a gpg key which was used to verify packages. The one
generated by lorax-composer doesn't have this, because it doesn't verify
signatures.

Also, lorax generates an image with a separate /boot partition. This is
not yet addressed here, because osbuild doesn't support it yet.
This commit is contained in:
Lars Karlitski 2019-10-29 03:42:26 +01:00 committed by Tom Gundersen
parent cde1325bc3
commit 930347c56e
3 changed files with 46 additions and 30 deletions

View file

@ -166,7 +166,7 @@ func TestFilenameFromType(t *testing.T) {
{
name: "vmdk",
args: args{"vmdk"},
want: "image.vmdk",
want: "disk.vmdk",
want1: "application/x-vmdk",
},
{

View file

@ -5,16 +5,31 @@ import "github.com/osbuild/osbuild-composer/internal/pipeline"
type vmdkOutput struct{}
func (t *vmdkOutput) translate(b *Blueprint) *pipeline.Pipeline {
p := getF30Pipeline()
packages := [...]string{
"@core",
"chrony",
"firewalld",
"grub2-pc",
"kernel",
"langpacks-en",
"open-vm-tools",
"selinux-policy-targeted",
}
excludedPackages := [...]string{
"dracut-config-rescue",
}
p := getCustomF30PackageSet(packages[:], excludedPackages[:])
addF30LocaleStage(p)
addF30FSTabStage(p)
addF30GRUB2Stage(p, b.getKernelCustomization())
addF30FixBlsStage(p)
addF30SELinuxStage(p)
addF30QemuAssembler(p, "vmdk", t.getName())
return p
}
func (t *vmdkOutput) getName() string {
return "image.vmdk"
return "disk.vmdk"
}
func (t *vmdkOutput) getMime() string {