Test if can deprecate hotfix of Ignore when base image has overlay or diskpath.

Author: liulanze

toolkit/tools/pkg/imagecustomizerlib/extendedmountidentifiertype.go

@@ -23,11 +23,6 @@ const (
 	// ExtendedMountIdentifierTypeDev mounts this partition via a device.
 	ExtendedMountIdentifierTypeDev ExtendedMountIdentifierType = "dev"
 
-	// ToDo: overlay, disk path mount id type for LG to customize overlay enabled base image.
-	//
-	ExtendedMountIdentifierTypeOverlay  ExtendedMountIdentifierType = "overlay"
-	ExtendedMountIdentifierTypeDiskPath ExtendedMountIdentifierType = "disk-path"
-
 	// ExtendedMountIdentifierTypeDefault uses the default type, which is PARTUUID.
 	ExtendedMountIdentifierTypeDefault ExtendedMountIdentifierType = ""
 )

toolkit/tools/pkg/imagecustomizerlib/partitionutils.go

@@ -218,17 +218,11 @@ func fstabEntriesToMountPoints(fstabEntries []diskutils.FstabEntry, diskPartitio
 	partUuidToFstabEntry := make(map[string]diskutils.FstabEntry)
 	verityMetadataList := []verityDeviceMetadata(nil)
 	for _, fstabEntry := range filteredFstabEntries {
-		partitionType, partition, _, verityMetadata, err := findSourcePartition(fstabEntry.Source, diskPartitions, buildDir)
+		_, partition, _, verityMetadata, err := findSourcePartition(fstabEntry.Source, diskPartitions, buildDir)
 		if err != nil {
 			return nil, nil, nil, err
 		}
 
-		// ToDo: Ignore when overlay / diskpath enabled base image.
-		//
-		if partitionType == ExtendedMountIdentifierTypeOverlay || partitionType == ExtendedMountIdentifierTypeDiskPath {
-			continue
-		}
-
 		// Unset read-only flag so that read-only partitions can be customized.
 		vfsOptions := fstabEntry.VfsOptions & ^diskutils.MountFlags(unix.MS_RDONLY)
 
@@ -289,16 +283,9 @@ func findSourcePartition(source string, partitions []diskutils.PartitionInfo,
 		return ExtendedMountIdentifierTypeDefault, diskutils.PartitionInfo{}, 0, nil, err
 	}
 
-	// ToDo: Ignore when customize overlay / diskpath enabled base image.
-	//
-	var partition diskutils.PartitionInfo
-	var partitionIndex int
-	var verityMetadata *verityDeviceMetadata
-	if mountIdType != ExtendedMountIdentifierTypeOverlay && mountIdType != ExtendedMountIdentifierTypeDiskPath {
-		partition, partitionIndex, verityMetadata, err = findExtendedPartition(mountIdType, mountId, partitions, buildDir)
-		if err != nil {
-			return ExtendedMountIdentifierTypeDefault, diskutils.PartitionInfo{}, 0, nil, err
-		}
+	partition, partitionIndex, verityMetadata, err := findExtendedPartition(mountIdType, mountId, partitions, buildDir)
+	if err != nil {
+		return ExtendedMountIdentifierTypeDefault, diskutils.PartitionInfo{}, 0, nil, err
 	}
 
 	return mountIdType, partition, partitionIndex, verityMetadata, nil
@@ -677,16 +664,6 @@ func parseExtendedSourcePartition(source string) (ExtendedMountIdentifierType, s
 		return ExtendedMountIdentifierTypePartLabel, partLabel, nil
 	}
 
-	// ToDo: Ignore when customize overlay / diskpath enabled base image.
-	//
-	if source == "overlay" {
-		return ExtendedMountIdentifierTypeOverlay, "", nil
-	}
-	_, isDeviceCustom := strings.CutPrefix(source, "/dev/disk")
-	if isDeviceCustom {
-		return ExtendedMountIdentifierTypeDiskPath, "", nil
-	}
-
 	if strings.HasPrefix(source, "/dev") {
 		return ExtendedMountIdentifierTypeDev, source, nil
 	}