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

distro/rhel84: use user ref for commits

Browse source 
Bug fix for changes introduced in #1244.

The new image types, rhel-edge-container and rhel-edge-installer, would
ignore the user-supplied ostree ref and use the default everywhere.

The default should only be used when a ref is not specified, which the
weldr API takes care of before calling the Manifest() method.
This commit is contained in:
Achilleas Koutsou 2021-03-18 12:50:05 +01:00 • committed by Tom Gundersen
parent dbee4cdbd1
commit f4ec9d8d91
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
internal/distro/rhel84/distro_v2.go
View file

@ -322,7 +322,7 @@ func (t *imageTypeS2) ostreeCommitPipeline(options distro.ImageOptions) *osbuild
p.AddStage(osbuild.NewOSTreeCommitStage( p.AddStage(osbuild.NewOSTreeCommitStage(
&osbuild.OSTreeCommitStageOptions{ &osbuild.OSTreeCommitStageOptions{
Ref: t.OSTreeRef(), Ref: options.OSTree.Ref,
OSVersion: "8.4", // NOTE: Set on image type? OSVersion: "8.4", // NOTE: Set on image type?
Parent: options.OSTree.Parent, Parent: options.OSTree.Parent,
}, },
@ -346,7 +346,7 @@ func (t *imageTypeS2) containerTreePipeline(repos []rpmmd.RepoConfig, packages [
p.AddStage(osbuild.NewOSTreePullStage( p.AddStage(osbuild.NewOSTreePullStage(
&osbuild.OSTreePullStageOptions{Repo: "/var/www/html/repo"}, &osbuild.OSTreePullStageOptions{Repo: "/var/www/html/repo"},
t.ostreePullStageInputs("org.osbuild.pipeline", "name:ostree-commit", t.OSTreeRef()), t.ostreePullStageInputs("org.osbuild.pipeline", "name:ostree-commit", options.OSTree.Ref),
)) ))
return p return p
} }
@ -415,7 +415,7 @@ func (t *imageTypeS2) anacondaTreePipeline(repos []rpmmd.RepoConfig, packages []
p.AddStage(osbuild.NewAnacondaStage(t.anacondaStageOptions())) p.AddStage(osbuild.NewAnacondaStage(t.anacondaStageOptions()))
p.AddStage(osbuild.NewLoraxScriptStage(t.loraxScriptStageOptions())) p.AddStage(osbuild.NewLoraxScriptStage(t.loraxScriptStageOptions()))
p.AddStage(osbuild.NewDracutStage(t.dracutStageOptions(kernelVer))) p.AddStage(osbuild.NewDracutStage(t.dracutStageOptions(kernelVer)))
p.AddStage(osbuild.NewKickstartStage(t.kickstartStageOptions(fmt.Sprintf("file://%s", ostreeRepoPath)))) p.AddStage(osbuild.NewKickstartStage(t.kickstartStageOptions(fmt.Sprintf("file://%s", ostreeRepoPath), options.OSTree.Ref)))
return p return p
} }
@ -684,13 +684,13 @@ func (t *imageTypeS2) dracutStageOptions(kernelVer string) *osbuild.DracutStageO
} }
} }
func (t *imageTypeS2) kickstartStageOptions(ostreeURL string) *osbuild.KickstartStageOptions { func (t *imageTypeS2) kickstartStageOptions(ostreeURL, ostreeRef string) *osbuild.KickstartStageOptions {
return &osbuild.KickstartStageOptions{ return &osbuild.KickstartStageOptions{
Path: "/usr/share/anaconda/interactive-defaults.ks", Path: "/usr/share/anaconda/interactive-defaults.ks",
OSTree: osbuild.OSTreeOptions{ OSTree: osbuild.OSTreeOptions{
OSName: "rhel", OSName: "rhel",
URL: ostreeURL, URL: ostreeURL,
Ref: t.OSTreeRef(), Ref: ostreeRef,
GPG: false, GPG: false,
}, },
} }