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

distro/rhel85: make anaconda optional for dracut

Browse source 
Add an argument to `dracutStageOptions` so that additional dracut
modules can be supplied. Remove `anaconda` from the list of mods
that are included by default, and manually include it for the
anaconda based installer.

Co-Developed-by: Achilleas Koutsou <achilleas@koutsou.net>
Co-Developed-by: Antonio Murdaca <runcom@linux.com>
This commit is contained in:
Christian Kellner 2021-08-20 12:35:05 +02:00 • committed by Tom Gundersen
parent 10e4a853bd
commit 3781cc0f47
3 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
internal/distro/rhel85/pipelines.go
View file

@ -882,7 +882,9 @@ func anacondaTreePipeline(repos []rpmmd.RepoConfig, packages []rpmmd.PackageSpec
p.AddStage(osbuild.NewUsersStage(usersStageOptions))
p.AddStage(osbuild.NewAnacondaStage(anacondaStageOptions()))
p.AddStage(osbuild.NewLoraxScriptStage(loraxScriptStageOptions(arch)))
p.AddStage(osbuild.NewDracutStage(dracutStageOptions(kernelVer)))
p.AddStage(osbuild.NewDracutStage(dracutStageOptions(kernelVer, []string{
"anaconda",
})))
return p
}

4
internal/distro/rhel85/stage_options.go
View file

@ -176,7 +176,7 @@ func loraxScriptStageOptions(arch string) *osbuild.LoraxScriptStageOptions {
}
}
func dracutStageOptions(kernelVer string) *osbuild.DracutStageOptions {
func dracutStageOptions(kernelVer string, additionalModules []string) *osbuild.DracutStageOptions {
kernel := []string{kernelVer}
modules := []string{
"bash",
@ -197,7 +197,6 @@ func dracutStageOptions(kernelVer string) *osbuild.DracutStageOptions {
"plymouth",
"prefixdevname",
"prefixdevname-tools",
"anaconda",
"crypt",
"dm",
"dmsquash-live",
@ -229,6 +228,7 @@ func dracutStageOptions(kernelVer string) *osbuild.DracutStageOptions {
"shutdown",
"uefi-lib",
}
modules = append(modules, additionalModules...)
return &osbuild.DracutStageOptions{
Kernel: kernel,
Modules: modules,