cloudapi: support swap partitions and volume groups

Supporting "swap" as the fs_type requires making the mountpoint an
optional field.  When setting fs_type="swap", the mountpoint must be
empty.
This commit is contained in:
Achilleas Koutsou 2025-06-03 13:33:47 +02:00 committed by Tomáš Hozza
parent edb9b284d5
commit 6cd4bbc6d2
4 changed files with 233 additions and 232 deletions

View file

@ -1364,7 +1364,7 @@ func convertDiskCustomizations(disk *Disk) (*blueprint.DiskCustomization, error)
PartType: common.DerefOrDefault(fs.PartType),
MinSize: fsSize,
FilesystemTypedCustomization: blueprint.FilesystemTypedCustomization{
Mountpoint: fs.Mountpoint,
Mountpoint: common.DerefOrDefault(fs.Mountpoint),
Label: common.DerefOrDefault(fs.Label),
FSType: string(common.DerefOrDefault(fs.FsType)),
},
@ -1419,7 +1419,7 @@ func convertDiskCustomizations(disk *Disk) (*blueprint.DiskCustomization, error)
Name: common.DerefOrDefault(lv.Name),
MinSize: lvSize,
FilesystemTypedCustomization: blueprint.FilesystemTypedCustomization{
Mountpoint: lv.Mountpoint,
Mountpoint: common.DerefOrDefault(lv.Mountpoint),
Label: common.DerefOrDefault(lv.Label),
FSType: string(common.DerefOrDefault(lv.FsType)),
},