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

distro: add PwQuality to ImageConfig

Browse source 
Add it to all distros (8.6, 9.0) that support using ImageConfig
This commit is contained in:
Christian Kellner 2022-02-24 15:34:19 +01:00 • committed by Achilleas Koutsou
parent adfdb2cd39
commit 8f746698f0
3 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
internal/distro/image_config.go
View file

@ -38,6 +38,7 @@ type ImageConfig struct {
DNFConfig []*osbuild2.DNFConfigStageOptions
SshdConfig *osbuild2.SshdConfigStageOptions
Authconfig *osbuild2.AuthconfigStageOptions
PwQuality *osbuild2.PwqualityConfStageOptions
}
// InheritFrom inherits unset values from the provided parent configuration and
@ -114,6 +115,9 @@ func (c *ImageConfig) InheritFrom(parentConfig *ImageConfig) *ImageConfig {
if finalConfig.Authconfig == nil {
finalConfig.Authconfig = parentConfig.Authconfig
}
if finalConfig.PwQuality == nil {
finalConfig.PwQuality = parentConfig.PwQuality
}
}
return &finalConfig
}

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

@ -541,6 +541,10 @@ func osPipeline(t *imageType,
p.AddStage(osbuild.NewAuthconfigStage(authConfig))
}
if pwQuality := imageConfig.PwQuality; pwQuality != nil {
p.AddStage(osbuild.NewPwqualityConfStage(pwQuality))
}
if pt != nil {
p = prependKernelCmdlineStage(p, t, pt)
p.AddStage(osbuild.NewFSTabStage(osbuild.NewFSTabStageOptions(pt)))

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

@ -532,6 +532,10 @@ func osPipeline(t *imageType,
p.AddStage(osbuild.NewAuthconfigStage(authConfig))
}
if pwQuality := imageConfig.PwQuality; pwQuality != nil {
p.AddStage(osbuild.NewPwqualityConfStage(pwQuality))
}
if pt != nil {
kernelOptions := osbuild.GenImageKernelOptions(pt)
if t.kernelOptions != "" {