disk: rename all DOS type ID consts to match GUIDs

Rename the global constants to follow the same convention as the GPT GUIDs and UUIDs.
osbuild · Dec 11, 2024 · 53548a4 · 53548a4
1 parent b620926
commit 53548a4
Show file tree

Hide file tree

Showing 11 changed files with 72 additions and 70 deletions.
diff --git a/cmd/otk/osbuild-gen-partition-table/main.go b/cmd/otk/osbuild-gen-partition-table/main.go
@@ -175,7 +175,7 @@ func makePartitionTableFromOtkInput(input *Input) (*disk.PartitionTable, error)
 				part.UUID = disk.EFISystemPartitionUUID
 			case otkdisk.PartTypeDOS:
 				part.Bootable = true
-				part.Type = disk.DosFat16B
+				part.Type = disk.FAT16BDOSID
 			default:
 				return nil, fmt.Errorf("unsupported partition type: %v", input)
 			}

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: disk.DosPRePID,
+				PartType: disk.PRepPartitionDOSID,
 				PartUUID: "",
 			},
 			{
@@ -373,7 +373,7 @@ func TestGenPartitionTableIntegrationPPC(t *testing.T) {
 							Bootable: true,
 							Start:    1048576,
 							Size:     4194304,
-							Type:     disk.DosPRePID,
+							Type:     disk.PRepPartitionDOSID,
 						},
 						{
 							Start: 5242880,
@@ -497,7 +497,7 @@ func TestGenPartitionTableCustomizationExtraMp(t *testing.T) {
 						{
 							Start: 2148532224,
 							Size:  13744734208,
-							Type:  disk.DosLVMTypeID,
+							Type:  disk.LVMPartitionDOSID,
 							Payload: &disk.LVMVolumeGroup{
 								Name:        "rootvg",
 								Description: "created via lvm2 and osbuild",

diff --git a/pkg/disk/disk.go b/pkg/disk/disk.go
@@ -40,7 +40,7 @@ const (
 	// rounded to the next MiB.
 	DefaultGrainBytes = uint64(1048576) // 1 MiB
 
-	// UUIDs
+	// UUIDs for GPT disks
 	BIOSBootPartitionGUID = "21686148-6449-6E6F-744E-656564454649"
 	BIOSBootPartitionUUID = "FAC7F1FB-3E8D-4137-A512-961DE09A5549"
 
@@ -61,40 +61,42 @@ const (
 	// Extended Boot Loader Partition
 	XBootLDRPartitionGUID = "BC13C2FF-59E6-4262-A352-B275FD6F7172"
 
-	// DosFat16B used for the ESP-System partition
-	DosFat16B = "06"
-
-	// Partition type ID for any native Linux filesystem on dos
-	DosLinuxTypeID = "83"
-
-	// Partition type ID for LVM on dos
-	DosLVMTypeID = "8e"
+	// Partition type IDs for DOS disks
 
 	// Partition type ID for BIOS boot partition on dos.
 	// Type ID is for 'empty'.
 	// TODO: drop this completely when we convert the bios BOOT space to a
 	// partitionless gap/offset.
-	DosBIOSBootID = "00"
+	BIOSBootPartitionDOSID = "00"
+
+	// Partition type ID for any native Linux filesystem on dos
+	FilesystemLinuxDOSID = "83"
+
+	// FAT16BDOSID used for the ESP-System partition
+	FAT16BDOSID = "06"
+
+	// Partition type ID for LVM on dos
+	LVMPartitionDOSID = "8e"
 
 	// Partition type ID for ESP on dos
-	DosESPID = "ef"
+	EFISystemPartitionDOSID = "ef"
 
 	// Partition type ID for swap
-	DosSwapID = "82"
+	SwapPartitionDOSID = "82"
 
 	// Partition type ID for PRep on dos
-	DosPRePID = "41"
+	PRepPartitionDOSID = "41"
 )
 
 // pt type -> type -> ID mapping for convenience
 var idMap = map[PartitionTableType]map[string]string{
 	PT_DOS: {
-		"bios": DosBIOSBootID,
-		"boot": DosLinuxTypeID,
-		"data": DosLinuxTypeID,
-		"esp":  DosESPID,
-		"lvm":  DosLVMTypeID,
-		"swap": DosSwapID,
+		"bios": BIOSBootPartitionDOSID,
+		"boot": FilesystemLinuxDOSID,
+		"data": FilesystemLinuxDOSID,
+		"esp":  EFISystemPartitionDOSID,
+		"lvm":  LVMPartitionDOSID,
+		"swap": SwapPartitionDOSID,
 	},
 	PT_GPT: {
 		"bios": BIOSBootPartitionGUID,

diff --git a/pkg/disk/partition.go b/pkg/disk/partition.go
@@ -87,15 +87,15 @@ func (p *Partition) IsBIOSBoot() bool {
 		return false
 	}
 
-	return p.Type == BIOSBootPartitionGUID || p.Type == DosBIOSBootID
+	return p.Type == BIOSBootPartitionGUID || p.Type == BIOSBootPartitionDOSID
 }
 
 func (p *Partition) IsPReP() bool {
 	if p == nil {
 		return false
 	}
 
-	return p.Type == DosPRePID || p.Type == PRePartitionGUID
+	return p.Type == PRepPartitionDOSID || p.Type == PRePartitionGUID
 }
 
 func (p *Partition) MarshalJSON() ([]byte, error) {

diff --git a/pkg/disk/partition_table.go b/pkg/disk/partition_table.go
@@ -755,7 +755,7 @@ func (pt *PartitionTable) ensureLVM() error {
 		if pt.Type == PT_GPT {
 			part.Type = LVMPartitionGUID
 		} else {
-			part.Type = DosLVMTypeID
+			part.Type = LVMPartitionDOSID
 		}
 
 	} else {