diff --git a/internal/distro/rhel86/distro.go b/internal/distro/rhel86/distro.go index 62526c0c1..55456b1b5 100644 --- a/internal/distro/rhel86/distro.go +++ b/internal/distro/rhel86/distro.go @@ -1289,7 +1289,7 @@ func newDistro(distroName string) distro.Distro { rpmOstree: false, bootISO: true, bootable: true, - pipelines: tarInstallerPipelines, + pipelines: imageInstallerPipelines, buildPipelines: []string{"build"}, payloadPipelines: []string{"os", "anaconda-tree", "bootiso-tree", "bootiso"}, exports: []string{"bootiso"}, diff --git a/internal/distro/rhel86/pipelines.go b/internal/distro/rhel86/pipelines.go index 28955aa33..dc0754302 100644 --- a/internal/distro/rhel86/pipelines.go +++ b/internal/distro/rhel86/pipelines.go @@ -220,7 +220,7 @@ func edgeInstallerPipelines(t *imageType, customizations *blueprint.Customizatio return pipelines, nil } -func tarInstallerPipelines(t *imageType, customizations *blueprint.Customizations, options distro.ImageOptions, repos []rpmmd.RepoConfig, packageSetSpecs map[string][]rpmmd.PackageSpec, rng *rand.Rand) ([]osbuild.Pipeline, error) { +func imageInstallerPipelines(t *imageType, customizations *blueprint.Customizations, options distro.ImageOptions, repos []rpmmd.RepoConfig, packageSetSpecs map[string][]rpmmd.PackageSpec, rng *rand.Rand) ([]osbuild.Pipeline, error) { pipelines := make([]osbuild.Pipeline, 0) pipelines = append(pipelines, *buildPipeline(repos, packageSetSpecs[buildPkgsKey], t.arch.distro.runner)) @@ -253,7 +253,7 @@ func tarInstallerPipelines(t *imageType, customizations *blueprint.Customization pipelines = append(pipelines, *anacondaTreePipeline(repos, installerPackages, kernelVer, archName, d.product, d.osVersion, "BaseOS")) isolabel := fmt.Sprintf(d.isolabelTmpl, archName) pipelines = append(pipelines, *bootISOTreePipeline(kernelVer, archName, d.vendor, d.product, d.osVersion, isolabel, kickstartOptions, tarPayloadStages)) - pipelines = append(pipelines, *bootISOPipeline(t.Filename(), d.isolabelTmpl, t.Arch().Name(), true)) + pipelines = append(pipelines, *bootISOPipeline(t.Filename(), d.isolabelTmpl, t.Arch().Name(), t.Arch().Name() == "x86_64")) return pipelines, nil } diff --git a/internal/distro/rhel90/distro.go b/internal/distro/rhel90/distro.go index 43a5a34a9..8c7cd2282 100644 --- a/internal/distro/rhel90/distro.go +++ b/internal/distro/rhel90/distro.go @@ -1269,7 +1269,7 @@ func newDistro(distroName string) distro.Distro { rpmOstree: false, bootISO: true, bootable: true, - pipelines: tarInstallerPipelines, + pipelines: imageInstallerPipelines, buildPipelines: []string{"build"}, payloadPipelines: []string{"os", "anaconda-tree", "bootiso-tree", "bootiso"}, exports: []string{"bootiso"}, diff --git a/internal/distro/rhel90/pipelines.go b/internal/distro/rhel90/pipelines.go index 7829a5823..748d1668a 100644 --- a/internal/distro/rhel90/pipelines.go +++ b/internal/distro/rhel90/pipelines.go @@ -212,7 +212,7 @@ func edgeInstallerPipelines(t *imageType, customizations *blueprint.Customizatio return pipelines, nil } -func tarInstallerPipelines(t *imageType, customizations *blueprint.Customizations, options distro.ImageOptions, repos []rpmmd.RepoConfig, packageSetSpecs map[string][]rpmmd.PackageSpec, rng *rand.Rand) ([]osbuild.Pipeline, error) { +func imageInstallerPipelines(t *imageType, customizations *blueprint.Customizations, options distro.ImageOptions, repos []rpmmd.RepoConfig, packageSetSpecs map[string][]rpmmd.PackageSpec, rng *rand.Rand) ([]osbuild.Pipeline, error) { pipelines := make([]osbuild.Pipeline, 0) pipelines = append(pipelines, *buildPipeline(repos, packageSetSpecs[buildPkgsKey], t.arch.distro.runner)) @@ -245,7 +245,7 @@ func tarInstallerPipelines(t *imageType, customizations *blueprint.Customization pipelines = append(pipelines, *anacondaTreePipeline(repos, installerPackages, kernelVer, archName, d.product, d.osVersion, "BaseOS")) isolabel := fmt.Sprintf(d.isolabelTmpl, archName) pipelines = append(pipelines, *bootISOTreePipeline(kernelVer, archName, d.vendor, d.product, d.osVersion, isolabel, kickstartOptions, tarPayloadStages)) - pipelines = append(pipelines, *bootISOPipeline(t.Filename(), d.isolabelTmpl, t.Arch().Name(), true)) + pipelines = append(pipelines, *bootISOPipeline(t.Filename(), d.isolabelTmpl, t.Arch().Name(), t.Arch().Name() == "x86_64")) return pipelines, nil }