blueprint: sync latest changes from images

This commit syncs the latest changes from the blueprint changes
in the images library.

See osbuild/image-builder#1685

Author: mvo5

pkg/blueprint/disk_customizations.go

@@ -607,6 +607,14 @@ func (p *PartitionCustomization) ValidatePartitionLabel(ptType string) error {
 }
 
 func (p *PartitionCustomization) validatePlain(mountpoints map[string]bool) error {
+	if p.FSType == "none" {
+		// make sure the mountpoint is empty and return
+		if p.Mountpoint != "" {
+			return fmt.Errorf("mountpoint for none partition must be empty (got %q)", p.Mountpoint)
+		}
+		return nil
+	}
+
 	if p.FSType == "swap" {
 		// make sure the mountpoint is empty and return
 		if p.Mountpoint != "" {

pkg/blueprint/disk_customizations_test.go

@@ -865,6 +865,25 @@ func TestPartitioningValidation(t *testing.T) {
 			},
 			expectedMsg: "invalid partitioning customizations:\nunknown partition type: what",
 		},
+		"unhappy-none-with-mountpoint": {
+			partitioning: &blueprint.DiskCustomization{
+				Partitions: []blueprint.PartitionCustomization{
+					{
+						FilesystemTypedCustomization: blueprint.FilesystemTypedCustomization{
+							FSType:     "ext4",
+							Mountpoint: "/home",
+						},
+					},
+					{
+						FilesystemTypedCustomization: blueprint.FilesystemTypedCustomization{
+							FSType:     "none",
+							Mountpoint: "/none",
+						},
+					},
+				},
+			},
+			expectedMsg: "invalid partitioning customizations:\nmountpoint for none partition must be empty (got \"/none\")",
+		},
 		"unhappy-swap-with-mountpoint": {
 			partitioning: &blueprint.DiskCustomization{
 				Partitions: []blueprint.PartitionCustomization{