Green light for non-corruption option .

Author: liulanze

toolkit/tools/pkg/imagecustomizerlib/customizeverity.go

@@ -327,9 +327,13 @@ func parseSystemdVerityOptions(options string) (imagecustomizerapi.CorruptionOpt
 		case "restart-on-corruption":
 			corruptionOption = imagecustomizerapi.CorruptionOptionRestart
 
-		default:
-			return "", fmt.Errorf("unknown verity option (%s)", option)
+			// ToDo: Green light to LG for this non-corruption option `root-hash-signature=`
+			/*
+				default:
+					return "", fmt.Errorf("unknown verity option (%s)", option)
+			*/
 		}
+
 	}
 
 	return corruptionOption, nil
@@ -440,30 +444,3 @@ func findIdentifiedPartition(partitions []diskutils.PartitionInfo, ref imagecust
 	}
 	return partition, nil
 }
-
-func ParseSystemdVerityOptions(options string) (imagecustomizerapi.CorruptionOption, error) {
-	corruptionOption := imagecustomizerapi.CorruptionOptionIoError
-
-	optionValues := strings.Split(options, ",")
-	for _, option := range optionValues {
-		switch option {
-		case "":
-			// Ignore empty string.
-
-		case "ignore-corruption":
-			corruptionOption = imagecustomizerapi.CorruptionOptionIgnore
-
-		case "panic-on-corruption":
-			corruptionOption = imagecustomizerapi.CorruptionOptionPanic
-
-		case "restart-on-corruption":
-			corruptionOption = imagecustomizerapi.CorruptionOptionRestart
-
-		default:
-			// ToDo: Ignore unknown options like "root-hash-signature=/boot/root.hash.sig"
-			logger.Log.Debugf("Ignoring unknown verity option: %s", option)
-		}
-	}
-
-	return corruptionOption, nil
-}

toolkit/tools/pkg/imagecustomizerlib/partitionutils.go

@@ -447,11 +447,7 @@ func findVerityPartitionsFromCmdline(partitions []diskutils.PartitionInfo, cmdli
 		return diskutils.PartitionInfo{}, 0, verityDeviceMetadata{}, err
 	}
 
-<<<<<<< HEAD
 	corruptionOption, err := parseSystemdVerityOptions(options)
-=======
-	corruptionOption, err := ParseSystemdVerityOptions(options)
->>>>>>> 10e6d5509 (COSI output image type support.)
 	if err != nil {
 		err = fmt.Errorf("failed parse verity options (%s) kernel argument:\n%w", optionsArgName, err)
 		return diskutils.PartitionInfo{}, 0, verityDeviceMetadata{}, err