distro/rhel: fail on OSTree options for non-OSTree images

Modify the `checkOptions()` function to return an `error` in case the OSTree image options are specified for a non-OSTree based image. Previously, these would be silently ignored. Signed-off-by: Tomáš Hozza <[email protected]>
osbuild · Nov 27, 2024 · 78df054 · 78df054
1 parent e525754
commit 78df054
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/pkg/distro/rhel/imagetype.go b/pkg/distro/rhel/imagetype.go
@@ -333,6 +333,10 @@ func (t *ImageType) Manifest(bp *blueprint.Blueprint,
 // checkOptions checks the validity and compatibility of options and customizations for the image type.
 // Returns ([]string, error) where []string, if non-nil, will hold any generated warnings (e.g. deprecation notices).
 func (t *ImageType) checkOptions(bp *blueprint.Blueprint, options distro.ImageOptions) ([]string, error) {
+	if !t.RPMOSTree && options.OSTree != nil {
+		return nil, fmt.Errorf("OSTree is not supported for %q", t.Name())
+	}
+
 	if t.arch.distro.CheckOptions != nil {
 		return t.arch.distro.CheckOptions(t, bp, options)
 	}