diff --git a/bib/cmd/bootc-image-builder/legacy_iso.go b/bib/cmd/bootc-image-builder/legacy_iso.go index 82da4e370..f57b355a0 100644 --- a/bib/cmd/bootc-image-builder/legacy_iso.go +++ b/bib/cmd/bootc-image-builder/legacy_iso.go @@ -233,19 +233,19 @@ func labelForISO(os *osinfo.OSRelease, arch *arch.Arch) string { } } -// from:https://github.com/osbuild/images/blob/v0.201.0/data/distrodefs/rhel-10/imagetypes.yaml#L169 -var loraxRhelTemplates = []string{ - "80-rhel/runtime-postinstall.tmpl", - "80-rhel/runtime-cleanup.tmpl", +// from:https://github.com/osbuild/images/blob/v0.207.0/data/distrodefs/rhel-10/imagetypes.yaml#L169 +var loraxRhelTemplates = []manifest.InstallerLoraxTemplate{ + manifest.InstallerLoraxTemplate{Path: "80-rhel/runtime-postinstall.tmpl"}, + manifest.InstallerLoraxTemplate{Path: "80-rhel/runtime-cleanup.tmpl", AfterDracut: true}, } -// from:https://github.com/osbuild/images/blob/v0.201.0/data/distrodefs/fedora/imagetypes.yaml#L408 -var loraxFedoraTemplates = []string{ - "99-generic/runtime-postinstall.tmpl", - "99-generic/runtime-cleanup.tmpl", +// from:https://github.com/osbuild/images/blob/v0.207.0/data/distrodefs/fedora/imagetypes.yaml#L408 +var loraxFedoraTemplates = []manifest.InstallerLoraxTemplate{ + manifest.InstallerLoraxTemplate{Path: "99-generic/runtime-postinstall.tmpl"}, + manifest.InstallerLoraxTemplate{Path: "99-generic/runtime-cleanup.tmpl", AfterDracut: true}, } -func loraxTemplates(si osinfo.OSRelease) []string { +func loraxTemplates(si osinfo.OSRelease) []manifest.InstallerLoraxTemplate { switch { case si.ID == "rhel" || slices.Contains(si.IDLike, "rhel") || si.VersionID == "eln": return loraxRhelTemplates diff --git a/bib/go.mod b/bib/go.mod index fbd7e97fc..a07f9d76e 100644 --- a/bib/go.mod +++ b/bib/go.mod @@ -9,7 +9,7 @@ require ( github.com/hashicorp/go-version v1.7.0 github.com/osbuild/blueprint v1.16.0 github.com/osbuild/image-builder-cli v0.0.0-20250924085931-15de5139f521 - github.com/osbuild/images v0.205.0 + github.com/osbuild/images v0.207.0 github.com/sirupsen/logrus v1.9.3 github.com/spf13/cobra v1.10.1 github.com/spf13/pflag v1.0.10 diff --git a/bib/go.sum b/bib/go.sum index aca3b8618..203852663 100644 --- a/bib/go.sum +++ b/bib/go.sum @@ -247,6 +247,8 @@ github.com/osbuild/image-builder-cli v0.0.0-20250924085931-15de5139f521 h1:Mo1ht github.com/osbuild/image-builder-cli v0.0.0-20250924085931-15de5139f521/go.mod h1:oTn9T+bV9g/760hM/jX7AV0c4vuVIn6FjAnaVM9RzRo= github.com/osbuild/images v0.205.0 h1:uHRrqh/m2c0m3dzpUkLO+Hp2jwtkwNvAULBc1XxIzqA= github.com/osbuild/images v0.205.0/go.mod h1:qCXSG1P5HA+Apy7eYRfaJDGdeRa9G+nYx1sRRLXXR/U= +github.com/osbuild/images v0.207.0 h1:dr48SI+9LO5V6BZeVsln61wLltUoATW2OivV0PHNpPU= +github.com/osbuild/images v0.207.0/go.mod h1:iF6bTLzBtyp9l27fexsD5AzwHEn9+bXF5Jr4HHQecmI= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=