manifest: use new ostree mount in fstab stage for commit deployment

Use the new stage mount instead of the old stage-specific options.
This commit is contained in:
Achilleas Koutsou 2022-08-23 19:12:01 +02:00 committed by Tom Gundersen
parent 1de55c73e6
commit fbe8c1cb39
7 changed files with 81 additions and 43 deletions

View file

@ -152,13 +152,9 @@ func (p *OSTreeDeployment) serialize() osbuild.Pipeline {
))
fstabOptions := osbuild.NewFSTabStageOptions(p.PartitionTable)
fstabOptions.OSTree = &osbuild.OSTreeFstab{
Deployment: osbuild.OSTreeDeployment{
OSName: p.osName,
Ref: p.osTreeRef,
},
}
pipeline.AddStage(osbuild.NewFSTabStage(fstabOptions))
fstabStage := osbuild.NewFSTabStage(fstabOptions)
fstabStage.MountOSTree(p.osName, p.osTreeRef, 0)
pipeline.AddStage(fstabStage)
if p.Keyboard != "" {
options := &osbuild.KeymapStageOptions{