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

distro: add YumConfig to ImageConfig

Browse source 
Not adding the actual option to any existing pipelines, since this is
only going to be relevant for rhel7.
This commit is contained in:
Christian Kellner 2022-05-29 16:52:20 +02:00
parent 42038ad47b
commit 13ce6140b9
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
internal/distro/image_config.go
View file

@ -44,6 +44,7 @@ type ImageConfig struct {
WAAgentConfig *osbuild2.WAAgentConfStageOptions WAAgentConfig *osbuild2.WAAgentConfStageOptions
Grub2Config *osbuild2.GRUB2Config Grub2Config *osbuild2.GRUB2Config
DNFAutomaticConfig *osbuild2.DNFAutomaticConfigStageOptions DNFAutomaticConfig *osbuild2.DNFAutomaticConfigStageOptions
YumConfig *osbuild2.YumConfigStageOptions
YUMRepos []*osbuild2.YumReposStageOptions YUMRepos []*osbuild2.YumReposStageOptions
Firewall *osbuild2.FirewallStageOptions Firewall *osbuild2.FirewallStageOptions
UdevRules *osbuild2.UdevRulesStageOptions UdevRules *osbuild2.UdevRulesStageOptions
@ -132,6 +133,9 @@ func (c *ImageConfig) InheritFrom(parentConfig *ImageConfig) *ImageConfig {
if finalConfig.DNFAutomaticConfig == nil { if finalConfig.DNFAutomaticConfig == nil {
finalConfig.DNFAutomaticConfig = parentConfig.DNFAutomaticConfig finalConfig.DNFAutomaticConfig = parentConfig.DNFAutomaticConfig
} }
if finalConfig.YumConfig == nil {
finalConfig.YumConfig = parentConfig.YumConfig
}
if finalConfig.YUMRepos == nil { if finalConfig.YUMRepos == nil {
finalConfig.YUMRepos = parentConfig.YUMRepos finalConfig.YUMRepos = parentConfig.YUMRepos
} }