Skip to content

Commit 3d6d3ea

Browse files
committed
iso: images compatibility
In images the Lorax templates are a struct since 0.206.0 [1]. [1]: osbuild/images#1949 Signed-off-by: Simon de Vlieger <[email protected]>
1 parent 3b33b8e commit 3d6d3ea

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

bib/cmd/bootc-image-builder/legacy_iso.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -233,19 +233,19 @@ func labelForISO(os *osinfo.OSRelease, arch *arch.Arch) string {
233233
}
234234
}
235235

236-
// from:https://github.com/osbuild/images/blob/v0.201.0/data/distrodefs/rhel-10/imagetypes.yaml#L169
237-
var loraxRhelTemplates = []string{
238-
"80-rhel/runtime-postinstall.tmpl",
239-
"80-rhel/runtime-cleanup.tmpl",
236+
// from:https://github.com/osbuild/images/blob/v0.207.0/data/distrodefs/rhel-10/imagetypes.yaml#L169
237+
var loraxRhelTemplates = []manifest.InstallerLoraxTemplate{
238+
manifest.InstallerLoraxTemplate{Path: "80-rhel/runtime-postinstall.tmpl"},
239+
manifest.InstallerLoraxTemplate{Path: "80-rhel/runtime-cleanup.tmpl", AfterDracut: true},
240240
}
241241

242-
// from:https://github.com/osbuild/images/blob/v0.201.0/data/distrodefs/fedora/imagetypes.yaml#L408
243-
var loraxFedoraTemplates = []string{
244-
"99-generic/runtime-postinstall.tmpl",
245-
"99-generic/runtime-cleanup.tmpl",
242+
// from:https://github.com/osbuild/images/blob/v0.207.0/data/distrodefs/fedora/imagetypes.yaml#L408
243+
var loraxFedoraTemplates = []manifest.InstallerLoraxTemplate{
244+
manifest.InstallerLoraxTemplate{Path: "99-generic/runtime-postinstall.tmpl"},
245+
manifest.InstallerLoraxTemplate{Path: "99-generic/runtime-cleanup.tmpl", AfterDracut: true},
246246
}
247247

248-
func loraxTemplates(si osinfo.OSRelease) []string {
248+
func loraxTemplates(si osinfo.OSRelease) []manifest.InstallerLoraxTemplate {
249249
switch {
250250
case si.ID == "rhel" || slices.Contains(si.IDLike, "rhel") || si.VersionID == "eln":
251251
return loraxRhelTemplates

0 commit comments

Comments
 (0)