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

distro/rhel85: name param for xorrisofs input

Browse source 
It might not always be `bootiso-tree`.
This commit is contained in:
Achilleas Koutsou 2021-08-20 12:59:19 +02:00 • committed by Tom Gundersen
parent 3781cc0f47
commit 4126f4e17a
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
internal/distro/rhel85/pipelines.go
View file

@ -905,7 +905,7 @@ func bootISOPipeline(filename string, arch string) *osbuild.Pipeline {
p.Name = "bootiso"
p.Build = "name:build"
p.AddStage(osbuild.NewXorrisofsStage(xorrisofsStageOptions(filename, arch), xorrisofsStageInputs()))
p.AddStage(osbuild.NewXorrisofsStage(xorrisofsStageOptions(filename, arch), xorrisofsStageInputs("bootiso-tree")))
p.AddStage(osbuild.NewImplantisomd5Stage(&osbuild.Implantisomd5StageOptions{Filename: filename}))
return p

4
internal/distro/rhel85/stage_inputs.go
View file

@ -42,11 +42,11 @@ func ostreePullStageInputs(origin, source, commitRef string) *osbuild.OSTreePull
return &osbuild.OSTreePullStageInputs{Commits: pullStageInput}
}
func xorrisofsStageInputs() *osbuild.XorrisofsStageInputs {
func xorrisofsStageInputs(pipeline string) *osbuild.XorrisofsStageInputs {
input := new(osbuild.XorrisofsStageInput)
input.Type = "org.osbuild.tree"
input.Origin = "org.osbuild.pipeline"
input.References = osbuild.XorrisofsStageReferences{"name:bootiso-tree"}
input.References = osbuild.XorrisofsStageReferences{"name:" + pipeline}
return &osbuild.XorrisofsStageInputs{Tree: input}
}