diff --git a/internal/manifest/coi_iso_tree.go b/internal/manifest/coi_iso_tree.go index ca379a0f3..7ba3d5ae8 100644 --- a/internal/manifest/coi_iso_tree.go +++ b/internal/manifest/coi_iso_tree.go @@ -92,7 +92,7 @@ func (p *CoreOSISOTree) serialize() osbuild.Pipeline { } pipeline.AddStage(osbuild.NewMkdirStage(&osbuild.MkdirStageOptions{ - Paths: []osbuild.Path{ + Paths: []osbuild.MkdirStagePath{ { Path: "images", }, diff --git a/internal/manifest/commit_deployment.go b/internal/manifest/commit_deployment.go index a247fd12b..b7edc25ba 100644 --- a/internal/manifest/commit_deployment.go +++ b/internal/manifest/commit_deployment.go @@ -90,7 +90,7 @@ func (p *OSTreeDeployment) serialize() osbuild.Pipeline { }, )) pipeline.AddStage(osbuild.NewMkdirStage(&osbuild.MkdirStageOptions{ - Paths: []osbuild.Path{ + Paths: []osbuild.MkdirStagePath{ { Path: "/boot/efi", Mode: os.FileMode(0700), diff --git a/internal/manifest/iso_rootfs.go b/internal/manifest/iso_rootfs.go index 02cfa492c..edd9d4dc7 100644 --- a/internal/manifest/iso_rootfs.go +++ b/internal/manifest/iso_rootfs.go @@ -28,7 +28,7 @@ func (p *ISORootfsImg) serialize() osbuild.Pipeline { pipeline := p.Base.serialize() pipeline.AddStage(osbuild.NewMkdirStage(&osbuild.MkdirStageOptions{ - Paths: []osbuild.Path{ + Paths: []osbuild.MkdirStagePath{ { Path: "LiveOS", }, diff --git a/internal/manifest/iso_tree.go b/internal/manifest/iso_tree.go index 0f327ed1d..c7f8e951a 100644 --- a/internal/manifest/iso_tree.go +++ b/internal/manifest/iso_tree.go @@ -125,7 +125,7 @@ func (p *AnacondaISOTree) serialize() osbuild.Pipeline { } pipeline.AddStage(osbuild.NewMkdirStage(&osbuild.MkdirStageOptions{ - Paths: []osbuild.Path{ + Paths: []osbuild.MkdirStagePath{ { Path: "images", }, diff --git a/internal/osbuild/mkdir_stage.go b/internal/osbuild/mkdir_stage.go index 5cef1c612..65460305b 100644 --- a/internal/osbuild/mkdir_stage.go +++ b/internal/osbuild/mkdir_stage.go @@ -4,10 +4,10 @@ import "os" // Options for the org.osbuild.ostree.config stage. type MkdirStageOptions struct { - Paths []Path `json:"paths"` + Paths []MkdirStagePath `json:"paths"` } -type Path struct { +type MkdirStagePath struct { Path string `json:"path"` Mode os.FileMode `json:"mode,omitempty"`