Skip to content

Commit b66f87a

Browse files
committed
Decompress the guestagent if required
Signed-off-by: Anders F Björklund <[email protected]>
1 parent 52cd3b8 commit b66f87a

File tree

1 file changed

+32
-1
lines changed

1 file changed

+32
-1
lines changed

Diff for: cmd/limactl/guest-install.go

+32-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@ package main
22

33
import (
44
"bytes"
5+
"compress/gzip"
6+
"errors"
57
"fmt"
8+
"io"
69
"os"
710
"os/exec"
811
"path/filepath"
@@ -75,13 +78,41 @@ func guestInstallAction(cmd *cobra.Command, args []string) error {
7578
if err != nil {
7679
return err
7780
}
81+
guestAgentFilename := filepath.Base(guestAgentBinary)
82+
if _, err := os.Stat(guestAgentBinary); err != nil {
83+
if !errors.Is(err, os.ErrNotExist) {
84+
return err
85+
}
86+
compressedGuestAgent, err := os.Open(guestAgentBinary + ".gz")
87+
if err != nil {
88+
return err
89+
}
90+
defer compressedGuestAgent.Close()
91+
tmpGuestAgent, err := os.CreateTemp("", "lima-guestagent-")
92+
if err != nil {
93+
return err
94+
}
95+
logrus.Debugf("Decompressing %s.gz", guestAgentBinary)
96+
guestAgent, err := gzip.NewReader(compressedGuestAgent)
97+
if err != nil {
98+
return err
99+
}
100+
defer guestAgent.Close()
101+
_, err = io.Copy(tmpGuestAgent, guestAgent)
102+
if err != nil {
103+
return err
104+
}
105+
tmpGuestAgent.Close()
106+
guestAgentBinary = tmpGuestAgent.Name()
107+
defer os.RemoveAll(guestAgentBinary)
108+
}
78109
tmpname := "lima-guestagent"
79110
tmp, err := shell(sshExe, sshFlags, hostname, "mktemp", "-t", "lima-guestagent.XXXXXX")
80111
if err != nil {
81112
return err
82113
}
83114
bin := prefix + "/bin/lima-guestagent"
84-
logrus.Infof("Copying %q to %s:%s", guestAgentBinary, inst.Name, tmpname)
115+
logrus.Infof("Copying %q to %s:%s", guestAgentFilename, inst.Name, tmpname)
85116
scpArgs := []string{guestAgentBinary, hostname + ":" + tmp}
86117
if err := runCmd(scpExe, scpFlags, scpArgs...); err != nil {
87118
return nil

0 commit comments

Comments
 (0)