Skip to content

Commit 6d0541c

Browse files
committed
Decompress the guestagent if required
Signed-off-by: Anders F Björklund <anders.f.bjorklund@gmail.com>
1 parent ba08292 commit 6d0541c

File tree

1 file changed

+32
-1
lines changed

1 file changed

+32
-1
lines changed

cmd/limactl/guest-install.go

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@ package main
55

66
import (
77
"bytes"
8+
"compress/gzip"
9+
"errors"
810
"fmt"
11+
"io"
912
"os"
1013
"os/exec"
1114
"path/filepath"
@@ -79,13 +82,41 @@ func guestInstallAction(cmd *cobra.Command, args []string) error {
7982
if err != nil {
8083
return err
8184
}
85+
guestAgentFilename := filepath.Base(guestAgentBinary)
86+
if _, err := os.Stat(guestAgentBinary); err != nil {
87+
if !errors.Is(err, os.ErrNotExist) {
88+
return err
89+
}
90+
compressedGuestAgent, err := os.Open(guestAgentBinary + ".gz")
91+
if err != nil {
92+
return err
93+
}
94+
defer compressedGuestAgent.Close()
95+
tmpGuestAgent, err := os.CreateTemp("", "lima-guestagent-")
96+
if err != nil {
97+
return err
98+
}
99+
logrus.Debugf("Decompressing %s.gz", guestAgentBinary)
100+
guestAgent, err := gzip.NewReader(compressedGuestAgent)
101+
if err != nil {
102+
return err
103+
}
104+
defer guestAgent.Close()
105+
_, err = io.Copy(tmpGuestAgent, guestAgent)
106+
if err != nil {
107+
return err
108+
}
109+
tmpGuestAgent.Close()
110+
guestAgentBinary = tmpGuestAgent.Name()
111+
defer os.RemoveAll(guestAgentBinary)
112+
}
82113
tmpname := "lima-guestagent"
83114
tmp, err := shell(sshExe, sshFlags, hostname, "mktemp", "-t", "lima-guestagent.XXXXXX")
84115
if err != nil {
85116
return err
86117
}
87118
bin := prefix + "/bin/lima-guestagent"
88-
logrus.Infof("Copying %q to %s:%s", guestAgentBinary, inst.Name, tmpname)
119+
logrus.Infof("Copying %q to %s:%s", guestAgentFilename, inst.Name, tmpname)
89120
scpArgs := []string{guestAgentBinary, hostname + ":" + tmp}
90121
if err := runCmd(scpExe, scpFlags, scpArgs...); err != nil {
91122
return nil

0 commit comments

Comments
 (0)