From 13ce6140b9805c0648427744822db3b5ec40cd8e Mon Sep 17 00:00:00 2001 From: Christian Kellner Date: Sun, 29 May 2022 16:52:20 +0200 Subject: [PATCH] distro: add YumConfig to ImageConfig Not adding the actual option to any existing pipelines, since this is only going to be relevant for rhel7. --- internal/distro/image_config.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/internal/distro/image_config.go b/internal/distro/image_config.go index 2511c3df9..2dbf553aa 100644 --- a/internal/distro/image_config.go +++ b/internal/distro/image_config.go @@ -44,6 +44,7 @@ type ImageConfig struct { WAAgentConfig *osbuild2.WAAgentConfStageOptions Grub2Config *osbuild2.GRUB2Config DNFAutomaticConfig *osbuild2.DNFAutomaticConfigStageOptions + YumConfig *osbuild2.YumConfigStageOptions YUMRepos []*osbuild2.YumReposStageOptions Firewall *osbuild2.FirewallStageOptions UdevRules *osbuild2.UdevRulesStageOptions @@ -132,6 +133,9 @@ func (c *ImageConfig) InheritFrom(parentConfig *ImageConfig) *ImageConfig { if finalConfig.DNFAutomaticConfig == nil { finalConfig.DNFAutomaticConfig = parentConfig.DNFAutomaticConfig } + if finalConfig.YumConfig == nil { + finalConfig.YumConfig = parentConfig.YumConfig + } if finalConfig.YUMRepos == nil { finalConfig.YUMRepos = parentConfig.YUMRepos }