Move GuestAgentBinary to usrlocalsharelima

Signed-off-by: Anders F Björklund <[email protected]>

Author: afbjorklund

pkg/cidata/cidata.go

@@ -339,14 +339,18 @@ func GenerateISO9660(instDir, name string, y *limayaml.LimaYAML, udpDNSLocalPort
 		}
 	}
 
-	guestAgentBinary, err := GuestAgentBinary(*y.OS, *y.Arch)
+	guestAgentBinary, err := usrlocalsharelima.GuestAgentBinary(*y.OS, *y.Arch)
 	if err != nil {
 		return err
 	}
-	defer guestAgentBinary.Close()
+	guestAgent, err := os.Open(guestAgentBinary)
+	if err != nil {
+		return err
+	}
+	defer guestAgent.Close()
 	layout = append(layout, iso9660util.Entry{
 		Path:   "lima-guestagent",
-		Reader: guestAgentBinary,
+		Reader: guestAgent,
 	})
 
 	if nerdctlArchive != "" {
@@ -373,21 +377,6 @@ func GenerateISO9660(instDir, name string, y *limayaml.LimaYAML, udpDNSLocalPort
 	return iso9660util.Write(filepath.Join(instDir, filenames.CIDataISO), "cidata", layout)
 }
 
-func GuestAgentBinary(ostype limayaml.OS, arch limayaml.Arch) (io.ReadCloser, error) {
-	if ostype == "" {
-		return nil, errors.New("os must be set")
-	}
-	if arch == "" {
-		return nil, errors.New("arch must be set")
-	}
-	dir, err := usrlocalsharelima.Dir()
-	if err != nil {
-		return nil, err
-	}
-	gaPath := filepath.Join(dir, "lima-guestagent."+ostype+"-"+arch)
-	return os.Open(gaPath)
-}
-
 func getCert(content string) Cert {
 	lines := []string{}
 	for _, line := range strings.Split(content, "\n") {

pkg/usrlocalsharelima/usrlocalsharelima.go

@@ -60,3 +60,17 @@ func Dir() (string, error) {
 	return "", fmt.Errorf("failed to find \"lima-guestagent.%s-%s\" binary for %q, attempted %v",
 		ostype, arch, self, gaCandidates)
 }
+
+func GuestAgentBinary(ostype limayaml.OS, arch limayaml.Arch) (string, error) {
+	if ostype == "" {
+		return "", errors.New("os must be set")
+	}
+	if arch == "" {
+		return "", errors.New("arch must be set")
+	}
+	dir, err := Dir()
+	if err != nil {
+		return "", err
+	}
+	return filepath.Join(dir, "lima-guestagent."+ostype+"-"+arch), nil
+}