From afd697ef99304eae6bc65a46755d3e4df7b32341 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Mart=C3=ADn?= Date: Mon, 29 Jan 2024 16:16:30 +0100 Subject: [PATCH] Ensure FIPS files are added to the build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Make sure the FIPS files are always added to the build when needed. Fixes: #407 Signed-off-by: Miguel Martín --- pkg/manifest/os.go | 2 +- pkg/manifest/ostree_deployment.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/manifest/os.go b/pkg/manifest/os.go index 7ff80e2dee..e6df046290 100644 --- a/pkg/manifest/os.go +++ b/pkg/manifest/os.go @@ -611,7 +611,6 @@ func (p *OS) serialize() osbuild.Pipeline { Kernel: []string{p.kernelVer}, AddModules: []string{"fips"}, })) - p.Files = append(p.Files, osbuild.GenFIPSFiles()...) } if !p.KernelOptionsBootloader { @@ -733,6 +732,7 @@ func (p *OS) serialize() osbuild.Pipeline { } if p.FIPS { + p.Files = append(p.Files, osbuild.GenFIPSFiles()...) for _, stage := range osbuild.GenFIPSStages() { pipeline.AddStage(stage) } diff --git a/pkg/manifest/ostree_deployment.go b/pkg/manifest/ostree_deployment.go index 46ef85e7d0..3a79326f7e 100644 --- a/pkg/manifest/ostree_deployment.go +++ b/pkg/manifest/ostree_deployment.go @@ -292,7 +292,6 @@ func (p *OSTreeDeployment) serialize() osbuild.Pipeline { if p.FIPS { kernelOpts = append(kernelOpts, osbuild.GenFIPSKernelOptions(p.PartitionTable)...) - p.Files = append(p.Files, osbuild.GenFIPSFiles()...) } var ref string @@ -408,6 +407,7 @@ func (p *OSTreeDeployment) serialize() osbuild.Pipeline { } if p.FIPS { + p.Files = append(p.Files, osbuild.GenFIPSFiles()...) for _, stage := range osbuild.GenFIPSStages() { stage.MountOSTree(p.osName, ref, 0) pipeline.AddStage(stage)