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

manifest: add support for waagent and udevrules to liveImage

Browse source 
Extend the OSCustomizations to include the WAAgentConfig and UdevRules
options.
Propagate those options from the image's config down to the
OSCustomizations and add the stages to the os pipeline when they're
specified.
This commit is contained in:
Achilleas Koutsou 2022-11-07 15:57:26 +01:00 • committed by Christian Kellner
parent f3e43a01bc
commit db88c734c1
2 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
internal/distro/rhel9/images.go
View file

@ -134,6 +134,8 @@ func osCustomizations(
osc.PwQuality = imageConfig.PwQuality
osc.RHSMConfig = imageConfig.RHSMConfig
osc.Subscription = options.Subscription
osc.WAAgentConfig = imageConfig.WAAgentConfig
osc.UdevRules = imageConfig.UdevRules
return osc
}

10
internal/manifest/os.go
View file

@ -83,6 +83,8 @@ type OSCustomizations struct {
PwQuality *osbuild.PwqualityConfStageOptions
OpenSCAPConfig *osbuild.OscapRemediationStageOptions
NTPServers []osbuild.ChronyConfigServer
WAAgentConfig *osbuild.WAAgentConfStageOptions
UdevRules *osbuild.UdevRulesStageOptions
LeapSecTZ *string
Subscription *distro.SubscriptionImageOptions
@ -428,6 +430,14 @@ func (p *OS) serialize() osbuild.Pipeline {
}
}
if waConfig := p.WAAgentConfig; waConfig != nil {
pipeline.AddStage(osbuild.NewWAAgentConfStage(waConfig))
}
if udevRules := p.UdevRules; udevRules != nil {
pipeline.AddStage(osbuild.NewUdevRulesStage(udevRules))
}
if pt := p.PartitionTable; pt != nil {
kernelOptions := osbuild.GenImageKernelOptions(p.PartitionTable)
kernelOptions = append(kernelOptions, p.KernelOptionsAppend...)