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

Always set rhsm.Facts when generating manifests

Browse source 
Make sure that images built by ibcli have correct rhsm.Facts set for
distributions that set it (this is handled by the distro definition, not
by the caller of the manifest generator).

Signed-off-by: Tomáš Hozza <thozza@redhat.com>
This commit is contained in:
Tomáš Hozza 2025-07-07 10:35:58 +02:00 • committed by Michael Vogt
parent 0bc6ce4db3
commit 8d0d7106c5
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
cmd/image-builder/manifest.go
View file

@ -13,6 +13,7 @@ import (
"github.com/osbuild/images/pkg/manifestgen"
"github.com/osbuild/images/pkg/osbuild"
"github.com/osbuild/images/pkg/ostree"
"github.com/osbuild/images/pkg/rhsm/facts"
"github.com/osbuild/images/pkg/sbom"
"github.com/osbuild/image-builder-cli/internal/blueprintload"
@ -91,12 +92,11 @@ func generateManifest(dataDir string, extraRepos []string, img *imagefilter.Resu
if err != nil {
return err
}
var imgOpts *distro.ImageOptions
if opts.Ostree != nil || opts.Subscription != nil {
imgOpts = &distro.ImageOptions{
OSTree: opts.Ostree,
Subscription: opts.Subscription,
}
imgOpts := &distro.ImageOptions{
Facts: &facts.ImageOptions{APIType: facts.IBCLI_APITYPE},
OSTree: opts.Ostree,
Subscription: opts.Subscription,
}
return mg.Generate(bp, img.Distro, img.ImgType, img.Arch, imgOpts)