disk: introduce a constant for bios-based PReP partition type

osbuild · Dec 5, 2024 · 1b04aa0 · 1b04aa0
1 parent 3822db7
commit 1b04aa0
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 7 deletions.
diff --git a/cmd/otk/osbuild-gen-partition-table/main_test.go b/cmd/otk/osbuild-gen-partition-table/main_test.go
@@ -343,7 +343,7 @@ func TestGenPartitionTableIntegrationPPC(t *testing.T) {
 				Name:     "ppc-boot",
 				Bootable: true,
 				Size:     "4 MiB",
-				PartType: "41",
+				PartType: disk.DosPRePID,
 				PartUUID: "",
 			},
 			{
@@ -373,7 +373,7 @@ func TestGenPartitionTableIntegrationPPC(t *testing.T) {
 							Bootable: true,
 							Start:    1048576,
 							Size:     4194304,
-							Type:     "41",
+							Type:     disk.DosPRePID,
 						},
 						{
 							Start: 5242880,

diff --git a/pkg/disk/disk.go b/pkg/disk/disk.go
@@ -75,6 +75,9 @@ const (
 
 	// Partition type ID for swap
 	DosSwapID = "82"
+
+	// Partition type ID for PRep on dos
+	DosPRePID = "41"
 )
 
 // pt type -> type -> ID mapping for convenience

diff --git a/pkg/disk/partition.go b/pkg/disk/partition.go
@@ -95,7 +95,7 @@ func (p *Partition) IsPReP() bool {
 		return false
 	}
 
-	return p.Type == "41" || p.Type == PRePartitionGUID
+	return p.Type == DosPRePID || p.Type == PRePartitionGUID
 }
 
 func (p *Partition) MarshalJSON() ([]byte, error) {

diff --git a/pkg/distro/fedora/partition_tables.go b/pkg/distro/fedora/partition_tables.go
@@ -112,7 +112,7 @@ var defaultBasePartitionTables = distro.BasePartitionTableMap{
 		Partitions: []disk.Partition{
 			{
 				Size:     4 * datasizes.MebiByte,
-				Type:     "41",
+				Type:     disk.DosPRePID,
 				Bootable: true,
 			},
 			{

diff --git a/pkg/distro/rhel/rhel10/partition_tables.go b/pkg/distro/rhel/rhel10/partition_tables.go
@@ -90,7 +90,7 @@ func defaultBasePartitionTables(t *rhel.ImageType) (disk.PartitionTable, bool) {
 			Partitions: []disk.Partition{
 				{
 					Size:     4 * datasizes.MebiByte,
-					Type:     "41",
+					Type:     disk.DosPRePID,
 					Bootable: true,
 				},
 				{

diff --git a/pkg/distro/rhel/rhel8/partition_tables.go b/pkg/distro/rhel/rhel8/partition_tables.go
@@ -91,7 +91,7 @@ func defaultBasePartitionTables(t *rhel.ImageType) (disk.PartitionTable, bool) {
 			Partitions: []disk.Partition{
 				{
 					Size:     4 * datasizes.MebiByte,
-					Type:     "41",
+					Type:     disk.DosPRePID,
 					Bootable: true,
 				},
 				{

diff --git a/pkg/distro/rhel/rhel9/partition_tables.go b/pkg/distro/rhel/rhel9/partition_tables.go
@@ -173,7 +173,7 @@ func defaultBasePartitionTables(t *rhel.ImageType) (disk.PartitionTable, bool) {
 			Partitions: []disk.Partition{
 				{
 					Size:     4 * datasizes.MebiByte,
-					Type:     "41",
+					Type:     disk.DosPRePID,
 					Bootable: true,
 				},
 				{