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

manifest: don't use the users flag in NewAnacondaStageOptions()

Browse source 
Before we only had one optional kickstart module we would enable that
was Users, so we just had a single boolean for adding it.  Now that we
often need to add multiple modules, keep the default ones in the
NewAnacondaStageOptions() function, but only have a single argument for
adding additional, optional modules.  If the user module needs to be
enabled, add it to the list of additional ones.
This commit is contained in:
Achilleas Koutsou 2022-12-13 15:29:37 +01:00 • committed by Tom Gundersen
parent 5485a3cb65
commit a63fe649cb
5 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
internal/image/ostree_installer.go
View file

@ -35,7 +35,8 @@ type OSTreeInstaller struct {
Filename string
AdditionalDracutModules []string
AdditionalDracutModules []string
AdditionalAnacondaModules []string
}
func NewOSTreeInstaller(commit ostree.CommitSpec) *OSTreeInstaller {
@ -67,6 +68,7 @@ func (img *OSTreeInstaller) InstantiateManifest(m *manifest.Manifest,
anacondaPipeline.Biosdevname = (img.Platform.GetArch() == platform.ARCH_X86_64)
anacondaPipeline.Checkpoint()
anacondaPipeline.AdditionalDracutModules = img.AdditionalDracutModules
anacondaPipeline.AdditionalAnacondaModules = img.AdditionalAnacondaModules
rootfsPartitionTable := &disk.PartitionTable{
Size: 20 * common.MebiByte,