Skip to content

Commit 9255c23

Browse files
authored
Image Customizer: Fix ISO customization. (#10885)
In change #10789, the `imagecustomizerapi.FileSystem` type had an internal field added called `PartitionId` which is filled in by the API validity checks. ISO to ISO customization supports cracking open the squashfs file and modifying the Live-OS. However, to do this, a temporary OS image must be created. This creation logic uses the `imagecustomizerapi.FileSystem` type but the code wasn't updated to ensure the `PartitionId` field has a value.
1 parent 04fe625 commit 9255c23

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

toolkit/tools/pkg/imagecustomizerlib/liveosisobuilder.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1444,16 +1444,18 @@ func (b *LiveOSIsoBuilder) createWriteableImageFromSquashfs(buildDir, rawImageFi
14441444

14451445
fileSystemConfigs := []imagecustomizerapi.FileSystem{
14461446
{
1447-
DeviceId: "esp",
1448-
Type: imagecustomizerapi.FileSystemTypeFat32,
1447+
DeviceId: "esp",
1448+
PartitionId: "esp",
1449+
Type: imagecustomizerapi.FileSystemTypeFat32,
14491450
MountPoint: &imagecustomizerapi.MountPoint{
14501451
Path: "/boot/efi",
14511452
Options: "umask=0077",
14521453
},
14531454
},
14541455
{
1455-
DeviceId: "rootfs",
1456-
Type: imagecustomizerapi.FileSystemTypeExt4,
1456+
DeviceId: "rootfs",
1457+
PartitionId: "rootfs",
1458+
Type: imagecustomizerapi.FileSystemTypeExt4,
14571459
MountPoint: &imagecustomizerapi.MountPoint{
14581460
Path: "/",
14591461
},

0 commit comments

Comments
 (0)