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

osbuild: remove 'users' boolean argument from NewAnacondaStageOptions()

Browse source 
Drop the argument altogether.
This commit is contained in:
Achilleas Koutsou 2022-12-13 15:52:24 +01:00 • committed by Tom Gundersen
parent a63fe649cb
commit a0528d2e53
3 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
internal/distro/rhel8/pipelines.go
View file

@ -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",

2
internal/manifest/anaconda.go
View file

@ -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(),

6
internal/osbuild/anaconda_stage.go
View file

@ -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...)
}