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

distro/rhel85: no biosdevname on aarch64

Browse source 
Do not include the biosdevname dracut module on aarch64, where it
does not exist.
This commit is contained in:
Christian Kellner 2021-08-27 20:18:32 +02:00 • committed by Tom Gundersen
parent 44cf29dad0
commit 3e90d66f5c
3 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1025,7 +1025,7 @@ func simplifiedInstallerTreePipeline(repos []rpmmd.RepoConfig, packages []rpmmd.
p.AddStage(osbuild.NewBuildstampStage(buildStampStageOptions(arch)))
p.AddStage(osbuild.NewLocaleStage(&osbuild.LocaleStageOptions{Language: "en_US.UTF-8"}))
p.AddStage(osbuild.NewSystemdStage(systemdStageOptions([]string{"coreos-installer"}, nil, nil, "")))
p.AddStage(osbuild.NewDracutStage(dracutStageOptions(kernelVer, []string{
p.AddStage(osbuild.NewDracutStage(dracutStageOptions(kernelVer, arch, []string{
"rdcore",
})))
@ -1146,7 +1146,7 @@ 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, []string{
p.AddStage(osbuild.NewDracutStage(dracutStageOptions(kernelVer, arch, []string{
"anaconda",
})))

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

@ -12,6 +12,7 @@ import (
"github.com/osbuild/osbuild-composer/internal/common"
"github.com/osbuild/osbuild-composer/internal/crypt"
"github.com/osbuild/osbuild-composer/internal/disk"
"github.com/osbuild/osbuild-composer/internal/distro"
osbuild "github.com/osbuild/osbuild-composer/internal/osbuild2"
"github.com/osbuild/osbuild-composer/internal/rpmmd"
)
@ -177,7 +178,7 @@ func loraxScriptStageOptions(arch string) *osbuild.LoraxScriptStageOptions {
}
}
func dracutStageOptions(kernelVer string, additionalModules []string) *osbuild.DracutStageOptions {
func dracutStageOptions(kernelVer, arch string, additionalModules []string) *osbuild.DracutStageOptions {
kernel := []string{kernelVer}
modules := []string{
"bash",
@ -219,7 +220,6 @@ func dracutStageOptions(kernelVer string, additionalModules []string) *osbuild.D
"rootfs-block",
"terminfo",
"udev-rules",
"biosdevname",
"dracut-systemd",
"pollcdrom",
"usrmount",
@ -229,6 +229,11 @@ func dracutStageOptions(kernelVer string, additionalModules []string) *osbuild.D
"shutdown",
"uefi-lib",
}
if arch == distro.X86_64ArchName {
modules = append(modules, "biosdevname")
}
modules = append(modules, additionalModules...)
return &osbuild.DracutStageOptions{
Kernel: kernel,

2
test/data/manifests/rhel_85-x86_64-image_installer-boot.json
View file

@ -1799,7 +1799,6 @@
"rootfs-block",
"terminfo",
"udev-rules",
"biosdevname",
"dracut-systemd",
"pollcdrom",
"usrmount",
@ -1808,6 +1807,7 @@
"img-lib",
"shutdown",
"uefi-lib",
"biosdevname",
"anaconda"
],
"install": [