Correction after rebase

post-processor/vagrant/libvirt.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"path/filepath"
 	"strconv"
+	"strings"
 
 	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
 )
@@ -68,16 +69,16 @@ func (p *LibVirtProvider) KeepInputArtifact() bool {
 func (p *LibVirtProvider) Process(ui packersdk.Ui, artifact packersdk.Artifact, dir string) (vagrantfile string, metadata map[string]interface{}, err error) {
 	disks := []map[string]string{}
 	format := artifact.State("diskType").(string)
-
+	diskName := artifact.State("diskName").(string)
 	// Copy the disk image into the temporary directory (as box.img)
 	for i, path := range artifact.Files() {
-		// DiskName is [vmName, vmName1, vmName2]
+		// DiskName is [vmName, vmName-1, vmName-2]
 		if strings.HasPrefix(filepath.Base(path), diskName) {
 			ui.Message(fmt.Sprintf("Copying from artifact: %s", path))
-			diskName := fmt.Sprintf("box_%d.img", i)
-			dstPath := filepath.Join(dir, diskName)
+			dstDiskName := fmt.Sprintf("box_%d.img", i)
+			dstPath := filepath.Join(dir, dstDiskName)
 			disks = append(disks, map[string]string{
-				"path":   diskName,
+				"path":   dstDiskName,
 				"format": format,
 			})
 			if err = CopyContents(dstPath, path); err != nil {

post-processor/vagrant/libvirt_test.go

@@ -90,12 +90,12 @@ func Test_ManyFilesInArtifact(t *testing.T) {
 			[]string{},
 		},
 		{
-			[]string{"test-0"},
+			[]string{"test"},
 			"vmdk",
 			[]string{"box_0.img"},
 		},
 		{
-			[]string{"test-0", "/test-1", "test-2"},
+			[]string{"test", "/test-1", "test-2"},
 			"qcow2",
 			[]string{"box_0.img", "box_1.img", "box_2.img"},
 		},
@@ -119,6 +119,7 @@ func Test_ManyFilesInArtifact(t *testing.T) {
 			StateValues: map[string]interface{}{
 				"diskType":   tc.Format,
 				"diskSize":   "1234M",
+				"diskName":   "test",
 				"domainType": "kvm",
 			},
 		}