diff --git a/internal/distro/rhel85/pipelines.go b/internal/distro/rhel85/pipelines.go index 753638d50..331c8c86a 100644 --- a/internal/distro/rhel85/pipelines.go +++ b/internal/distro/rhel85/pipelines.go @@ -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 } diff --git a/internal/distro/rhel85/stage_options.go b/internal/distro/rhel85/stage_options.go index d08827aa4..82633a16d 100644 --- a/internal/distro/rhel85/stage_options.go +++ b/internal/distro/rhel85/stage_options.go @@ -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, diff --git a/test/data/manifests/rhel_85-x86_64-image_installer-boot.json b/test/data/manifests/rhel_85-x86_64-image_installer-boot.json index fdac064dd..81bff8728 100644 --- a/test/data/manifests/rhel_85-x86_64-image_installer-boot.json +++ b/test/data/manifests/rhel_85-x86_64-image_installer-boot.json @@ -1778,7 +1778,6 @@ "plymouth", "prefixdevname", "prefixdevname-tools", - "anaconda", "crypt", "dm", "dmsquash-live", @@ -1808,7 +1807,8 @@ "fs-lib", "img-lib", "shutdown", - "uefi-lib" + "uefi-lib", + "anaconda" ], "install": [ "/.buildstamp"