go.mod: bump images to v0.26.0
This is mainly needed in order to get the RHEL 9 SAP Azure images.
This commit is contained in:
parent
d5483ccfb0
commit
807f249146
232 changed files with 32705 additions and 3663 deletions
20
vendor/github.com/osbuild/images/pkg/manifest/os.go
generated
vendored
20
vendor/github.com/osbuild/images/pkg/manifest/os.go
generated
vendored
|
|
@ -132,6 +132,8 @@ type OSCustomizations struct {
|
|||
// Custom directories and files to create in the image
|
||||
Directories []*fsnode.Directory
|
||||
Files []*fsnode.File
|
||||
|
||||
FIPS bool
|
||||
}
|
||||
|
||||
// OS represents the filesystem tree of the target image. This roughly
|
||||
|
|
@ -417,7 +419,7 @@ func (p *OS) serialize() osbuild.Pipeline {
|
|||
}
|
||||
|
||||
manifests := osbuild.NewFilesInputForManifestLists(p.containerSpecs)
|
||||
skopeo := osbuild.NewSkopeoStage(storagePath, images, manifests)
|
||||
skopeo := osbuild.NewSkopeoStageWithContainersStorage(storagePath, images, manifests)
|
||||
pipeline.AddStage(skopeo)
|
||||
}
|
||||
|
||||
|
|
@ -603,6 +605,16 @@ func (p *OS) serialize() osbuild.Pipeline {
|
|||
if pt := p.PartitionTable; pt != nil {
|
||||
kernelOptions := osbuild.GenImageKernelOptions(p.PartitionTable)
|
||||
kernelOptions = append(kernelOptions, p.KernelOptionsAppend...)
|
||||
|
||||
if p.FIPS {
|
||||
kernelOptions = append(kernelOptions, osbuild.GenFIPSKernelOptions(p.PartitionTable)...)
|
||||
pipeline.AddStage(osbuild.NewDracutStage(&osbuild.DracutStageOptions{
|
||||
Kernel: []string{p.kernelVer},
|
||||
AddModules: []string{"fips"},
|
||||
}))
|
||||
p.Files = append(p.Files, osbuild.GenFIPSFiles()...)
|
||||
}
|
||||
|
||||
if !p.KernelOptionsBootloader {
|
||||
pipeline = prependKernelCmdlineStage(pipeline, strings.Join(kernelOptions, " "), pt)
|
||||
}
|
||||
|
|
@ -721,6 +733,12 @@ func (p *OS) serialize() osbuild.Pipeline {
|
|||
pipeline.AddStage(osbuild.NewWSLConfStage(wslConf))
|
||||
}
|
||||
|
||||
if p.FIPS {
|
||||
for _, stage := range osbuild.GenFIPSStages() {
|
||||
pipeline.AddStage(stage)
|
||||
}
|
||||
}
|
||||
|
||||
if p.OpenSCAPTailorConfig != nil {
|
||||
if p.OpenSCAPConfig == nil {
|
||||
// This is a programming error, since it doesn't make sense
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue