distro: Add PartitioningMode to ImageOptions

And use it in the distro's getPartitionTable. TODO Logic about that combination of things is or is not supported needs a more central location than embedded in the functions.
osbuild · Oct 12, 2023 · 117134d · 117134d
1 parent 7b99e11
commit 117134d
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 10 deletions.
diff --git a/pkg/distro/distro.go b/pkg/distro/distro.go
@@ -130,10 +130,11 @@ type ImageType interface {
 
 // The ImageOptions specify options for a specific image build
 type ImageOptions struct {
-	Size         uint64
-	OSTree       *ostree.ImageOptions
-	Subscription *subscription.ImageOptions
-	Facts        *facts.ImageOptions
+	Size             uint64
+	OSTree           *ostree.ImageOptions
+	Subscription     *subscription.ImageOptions
+	Facts            *facts.ImageOptions
+	PartitioningMode disk.PartitioningMode
 }
 
 type BasePartitionTableMap map[string]disk.PartitionTable

diff --git a/pkg/distro/fedora/imagetype.go b/pkg/distro/fedora/imagetype.go
@@ -136,10 +136,15 @@ func (t *imageType) getPartitionTable(
 
 	imageSize := t.Size(options.Size)
 
-	partitioningMode := disk.AutoLVMPartitioningMode
+	partitioningMode := options.PartitioningMode
 	if t.rpmOstree {
-		// IoT supports only raw, force it.
-		partitioningMode = disk.RawPartitioningMode
+		// IoT supports only LVM, force it.
+		// Raw is not supported, return an error if it is requested
+		// TODO Need a central location for logic like this
+		if partitioningMode == disk.RawPartitioningMode {
+			return nil, fmt.Errorf("partitioning mode raw not supported for %s on %s", t.Name(), t.arch.Name())
+		}
+		partitioningMode = disk.AutoLVMPartitioningMode
 	}
 
 	return disk.NewPartitionTable(&basePartitionTable, mountpoints, imageSize, partitioningMode, t.requiredPartitionSizes, rng)

diff --git a/pkg/distro/rhel7/imagetype.go b/pkg/distro/rhel7/imagetype.go
@@ -125,7 +125,7 @@ func (t *imageType) getPartitionTable(
 
 	imageSize := t.Size(options.Size)
 
-	return disk.NewPartitionTable(&basePartitionTable, mountpoints, imageSize, disk.AutoLVMPartitioningMode, nil, rng)
+	return disk.NewPartitionTable(&basePartitionTable, mountpoints, imageSize, options.PartitioningMode, nil, rng)
 }
 
 func (t *imageType) getDefaultImageConfig() *distro.ImageConfig {

diff --git a/pkg/distro/rhel8/imagetype.go b/pkg/distro/rhel8/imagetype.go
@@ -156,9 +156,14 @@ func (t *imageType) getPartitionTable(
 
 	imageSize := t.Size(options.Size)
 
-	partitioningMode := disk.AutoLVMPartitioningMode
+	partitioningMode := options.PartitioningMode
 	if t.rpmOstree {
 		// Edge supports only raw, force it.
+		// LVM is not supported, return an error if it is requested
+		// TODO Need a central location for logic like this
+		if partitioningMode == disk.LVMPartitioningMode {
+			return nil, fmt.Errorf("partitioning mode lvm not supported for %s on %s", t.Name(), t.arch.Name())
+		}
 		partitioningMode = disk.RawPartitioningMode
 	}
 

diff --git a/pkg/distro/rhel9/imagetype.go b/pkg/distro/rhel9/imagetype.go
@@ -161,9 +161,15 @@ func (t *imageType) getPartitionTable(
 
 	imageSize := t.Size(options.Size)
 
-	partitioningMode := disk.AutoLVMPartitioningMode
+	partitioningMode := options.PartitioningMode
 	if t.rpmOstree {
 		// Edge supports only LVM, force it.
+		// Raw is not supported, return an error if it is requested
+		// TODO Need a central location for logic like this
+		if partitioningMode == disk.RawPartitioningMode {
+			return nil, fmt.Errorf("partitioning mode raw not supported for %s on %s", t.Name(), t.arch.Name())
+		}
+
 		partitioningMode = disk.LVMPartitioningMode
 	}