Skip to content

driverutil: s/diffDisk/srcDisk/ to avoid confusion #4463

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AkihiroSuda merged 1 commit into from
Dec 17, 2025
+4 −4
Merged

driverutil: s/diffDisk/srcDisk/ to avoid confusion #4463

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions pkg/driverutil/disk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ func EnsureDisk(ctx context.Context, instDir, diskSize string, diskImageFormat i
if err != nil {
return err
}
destDisk := baseDisk
srcDisk := baseDisk
if isBaseDiskISO {
destDisk = diffDisk
srcDisk = diffDisk

// Create an empty data volume for the diff disk
diffDiskF, err := os.Create(diffDisk)
Expand All @@ -54,8 +54,8 @@ func EnsureDisk(ctx context.Context, instDir, diskSize string, diskImageFormat i
}
// Check whether to use ASIF format

if err = diskUtil.Convert(ctx, diskImageFormat, destDisk, diffDisk, &diskSizeInBytes, false); err != nil {
return fmt.Errorf("failed to convert %q to a disk %q: %w", baseDisk, diffDisk, err)
if err = diskUtil.Convert(ctx, diskImageFormat, srcDisk, diffDisk, &diskSizeInBytes, false); err != nil {
return fmt.Errorf("failed to convert %q to a disk %q: %w", srcDisk, diffDisk, err)
}
return err
}
Loading