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

manifest: include yumconfig options in OS customizations

Browse source 
YUMConfig is supported in ImageConfig for RHEL 7.  We now copy the
options over to OSCustomizations and create the stage when necessary.
This commit is contained in:
Achilleas Koutsou 2023-01-24 19:16:01 +01:00 • committed by Tomáš Hozza
parent d2114d0f9e
commit 450c44aaff
2 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
internal/distro/rhel7/images.go
View file

@ -157,6 +157,7 @@ func osCustomizations(
osc.DNFConfig = imageConfig.DNFConfig osc.DNFConfig = imageConfig.DNFConfig
osc.DNFAutomaticConfig = imageConfig.DNFAutomaticConfig osc.DNFAutomaticConfig = imageConfig.DNFAutomaticConfig
osc.YUMRepos = imageConfig.YUMRepos osc.YUMRepos = imageConfig.YUMRepos
osc.YUMConfig = imageConfig.YumConfig
osc.SshdConfig = imageConfig.SshdConfig osc.SshdConfig = imageConfig.SshdConfig
osc.AuthConfig = imageConfig.Authconfig osc.AuthConfig = imageConfig.Authconfig
osc.PwQuality = imageConfig.PwQuality osc.PwQuality = imageConfig.PwQuality

5
internal/manifest/os.go
View file

@ -95,6 +95,7 @@ type OSCustomizations struct {
Sysctld []*osbuild.SysctldStageOptions Sysctld []*osbuild.SysctldStageOptions
DNFConfig []*osbuild.DNFConfigStageOptions DNFConfig []*osbuild.DNFConfigStageOptions
DNFAutomaticConfig *osbuild.DNFAutomaticConfigStageOptions DNFAutomaticConfig *osbuild.DNFAutomaticConfigStageOptions
YUMConfig *osbuild.YumConfigStageOptions
YUMRepos []*osbuild.YumReposStageOptions YUMRepos []*osbuild.YumReposStageOptions
SshdConfig *osbuild.SshdConfigStageOptions SshdConfig *osbuild.SshdConfigStageOptions
GCPGuestAgentConfig *osbuild.GcpGuestAgentConfigOptions GCPGuestAgentConfig *osbuild.GcpGuestAgentConfigOptions
@ -459,6 +460,10 @@ func (p *OS) serialize() osbuild.Pipeline {
pipeline.AddStage(osbuild.NewYumReposStage(yumRepo)) pipeline.AddStage(osbuild.NewYumReposStage(yumRepo))
} }
if p.YUMConfig != nil {
pipeline.AddStage(osbuild.NewYumConfigStage(p.YUMConfig))
}
if p.GCPGuestAgentConfig != nil { if p.GCPGuestAgentConfig != nil {
pipeline.AddStage(osbuild.NewGcpGuestAgentConfigStage(p.GCPGuestAgentConfig)) pipeline.AddStage(osbuild.NewGcpGuestAgentConfigStage(p.GCPGuestAgentConfig))
} }