From d32dff14b47c002bc05e2ca2f0657c5743b89cfb Mon Sep 17 00:00:00 2001 From: Achilleas Koutsou Date: Fri, 30 Sep 2022 17:00:44 +0200 Subject: [PATCH] image: make read only sysroot optional for OSTreeRawImage --- internal/image/ostree_raw.go | 3 +++ internal/manifest/commit_deployment.go | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/internal/image/ostree_raw.go b/internal/image/ostree_raw.go index 9ceea5a06..9c829e00d 100644 --- a/internal/image/ostree_raw.go +++ b/internal/image/ostree_raw.go @@ -26,6 +26,8 @@ type OSTreeRawImage struct { Commit ostree.CommitSpec + SysrootReadOnly bool + Remote ostree.Remote OSName string @@ -58,6 +60,7 @@ func (img *OSTreeRawImage) InstantiateManifest(m *manifest.Manifest, osPipeline.Locale = img.Locale osPipeline.Users = img.Users osPipeline.Groups = img.Groups + osPipeline.SysrootReadOnly = img.SysrootReadOnly imagePipeline := manifest.NewRawOStreeImage(m, buildPipeline, img.Platform, osPipeline) diff --git a/internal/manifest/commit_deployment.go b/internal/manifest/commit_deployment.go index 405bf90ba..222b4d4a8 100644 --- a/internal/manifest/commit_deployment.go +++ b/internal/manifest/commit_deployment.go @@ -23,6 +23,8 @@ type OSTreeDeployment struct { commit ostree.CommitSpec + SysrootReadOnly bool + osName string KernelOptionsAppend []string @@ -144,7 +146,7 @@ func (p *OSTreeDeployment) serialize() osbuild.Pipeline { Repo: repoPath, Config: &osbuild.OSTreeConfig{ Sysroot: &osbuild.SysrootOptions{ - ReadOnly: common.BoolToPtr(true), + ReadOnly: &p.SysrootReadOnly, Bootloader: "none", }, },