Skip to content

Fix iso_name + don't destroy iso when using iso_name #195

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
nathanael-h merged 1 commit into from
Mar 13, 2026
Merged

Fix iso_name + don't destroy iso when using iso_name #195

Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion builder/xenserver/common/step_upload_vdi.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ type StepUploadVdi struct {
VdiNameFunc func() string
ImagePathFunc func() string
VdiUuidKey string
PreserveVdi bool
}

func (self *StepUploadVdi) uploadVdi(ctx context.Context, state multistep.StateBag) multistep.StepAction {
Expand Down Expand Up @@ -105,7 +106,7 @@ func (self *StepUploadVdi) Cleanup(state multistep.StateBag) {

vdiName := self.VdiNameFunc()

if config.ShouldKeepVM(state) {
if config.ShouldKeepVM(state) || self.PreserveVdi {
return
}

Expand Down
6 changes: 5 additions & 1 deletion builder/xenserver/iso/builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,9 @@ func (self *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (p
&xscommon.StepFindOrUploadVdi{
xscommon.StepUploadVdi{
VdiNameFunc: func() string {
if self.config.ISOName != "" {
return self.config.ISOName
}
if len(self.config.ISOUrls) > 0 {
return path.Base(self.config.ISOUrls[0])
}
Expand All @@ -265,7 +268,8 @@ func (self *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (p
}
return ""
},
VdiUuidKey: "iso_vdi_uuid",
VdiUuidKey: "iso_vdi_uuid",
PreserveVdi: self.config.ISOName != "",
},
},
&xscommon.StepFindVdi{
Expand Down