diff --git a/internal/distro/rhel8/pipelines.go b/internal/distro/rhel8/pipelines.go index 618473132..d8a009306 100644 --- a/internal/distro/rhel8/pipelines.go +++ b/internal/distro/rhel8/pipelines.go @@ -1069,7 +1069,7 @@ func anacondaTreePipeline(repos []rpmmd.RepoConfig, packages []rpmmd.PackageSpec if users { anacondaModules = []string{"org.fedoraproject.Anaconda.Modules.Users"} } - p.AddStage(osbuild.NewAnacondaStage(osbuild.NewAnacondaStageOptions(false, anacondaModules))) + p.AddStage(osbuild.NewAnacondaStage(osbuild.NewAnacondaStageOptions(anacondaModules))) p.AddStage(osbuild.NewLoraxScriptStage(loraxScriptStageOptions(arch))) p.AddStage(osbuild.NewDracutStage(dracutStageOptions(kernelVer, arch, []string{ "anaconda", diff --git a/internal/manifest/anaconda.go b/internal/manifest/anaconda.go index 7dba37033..1f2939405 100644 --- a/internal/manifest/anaconda.go +++ b/internal/manifest/anaconda.go @@ -198,7 +198,7 @@ func (p *Anaconda) serialize() osbuild.Pipeline { pipeline.AddStage(osbuild.NewUsersStage(usersStageOptions)) - pipeline.AddStage(osbuild.NewAnacondaStage(osbuild.NewAnacondaStageOptions(false, p.AdditionalAnacondaModules))) + pipeline.AddStage(osbuild.NewAnacondaStage(osbuild.NewAnacondaStageOptions(p.AdditionalAnacondaModules))) pipeline.AddStage(osbuild.NewLoraxScriptStage(&osbuild.LoraxScriptStageOptions{ Path: "99-generic/runtime-postinstall.tmpl", BaseArch: p.platform.GetArch().String(), diff --git a/internal/osbuild/anaconda_stage.go b/internal/osbuild/anaconda_stage.go index 971bdbac0..b8d1d1e8a 100644 --- a/internal/osbuild/anaconda_stage.go +++ b/internal/osbuild/anaconda_stage.go @@ -15,17 +15,13 @@ func NewAnacondaStage(options *AnacondaStageOptions) *Stage { } } -func NewAnacondaStageOptions(users bool, additionalModules []string) *AnacondaStageOptions { +func NewAnacondaStageOptions(additionalModules []string) *AnacondaStageOptions { modules := []string{ "org.fedoraproject.Anaconda.Modules.Network", "org.fedoraproject.Anaconda.Modules.Payloads", "org.fedoraproject.Anaconda.Modules.Storage", } - if users { - modules = append(modules, "org.fedoraproject.Anaconda.Modules.Users") - } - if len(additionalModules) > 0 { modules = append(modules, additionalModules...) }