Skip to content

Commit

Permalink
distro/rhel: append dracut options from installer config to image
Browse files Browse the repository at this point in the history
The AdditionalDracutModules and AdditionalDrivers were already being set
on each installer image, but let's change it to append in case any
values are set by the initialiser or any other prior code.
  • Loading branch information
achilleas-k authored and thozza committed Feb 20, 2025
1 parent 2466700 commit 2f9f7f0
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions pkg/distro/rhel/images.go
Original file line number Diff line number Diff line change
Expand Up @@ -506,8 +506,8 @@ func EdgeInstallerImage(workload workload.Workload,
}

if installerConfig != nil {
img.AdditionalDracutModules = installerConfig.AdditionalDracutModules
img.AdditionalDrivers = installerConfig.AdditionalDrivers
img.AdditionalDracutModules = append(img.AdditionalDracutModules, installerConfig.AdditionalDracutModules...)
img.AdditionalDrivers = append(img.AdditionalDrivers, installerConfig.AdditionalDrivers...)
}

instCust, err := customizations.GetInstaller()
Expand Down Expand Up @@ -660,7 +660,8 @@ func EdgeSimplifiedInstallerImage(workload workload.Workload,
}

if installerConfig != nil {
img.AdditionalDracutModules = installerConfig.AdditionalDracutModules
img.AdditionalDracutModules = append(img.AdditionalDracutModules, installerConfig.AdditionalDracutModules...)
img.AdditionalDrivers = append(img.AdditionalDrivers, installerConfig.AdditionalDrivers...)
}

return img, nil
Expand Down Expand Up @@ -706,8 +707,8 @@ func ImageInstallerImage(workload workload.Workload,
}

if installerConfig != nil {
img.AdditionalDracutModules = installerConfig.AdditionalDracutModules
img.AdditionalDrivers = installerConfig.AdditionalDrivers
img.AdditionalDracutModules = append(img.AdditionalDracutModules, installerConfig.AdditionalDracutModules...)
img.AdditionalDrivers = append(img.AdditionalDrivers, installerConfig.AdditionalDrivers...)
}

instCust, err := customizations.GetInstaller()
Expand Down

0 comments on commit 2f9f7f0

Please sign in to comment.