Skip to content

Commit 43f5f5b

Browse files
committed
Decompress the guestagent if required
Signed-off-by: Anders F Björklund <[email protected]>
1 parent 927ecca commit 43f5f5b

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
@@ -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"
@@ -78,13 +81,41 @@ func guestInstallAction(cmd *cobra.Command, args []string) error {
7881
if err != nil {
7982
return err
8083
}
84+
guestAgentFilename := filepath.Base(guestAgentBinary)
85+
if _, err := os.Stat(guestAgentBinary); err != nil {
86+
if !errors.Is(err, os.ErrNotExist) {
87+
return err
88+
}
89+
compressedGuestAgent, err := os.Open(guestAgentBinary + ".gz")
90+
if err != nil {
91+
return err
92+
}
93+
defer compressedGuestAgent.Close()
94+
tmpGuestAgent, err := os.CreateTemp("", "lima-guestagent-")
95+
if err != nil {
96+
return err
97+
}
98+
logrus.Debugf("Decompressing %s.gz", guestAgentBinary)
99+
guestAgent, err := gzip.NewReader(compressedGuestAgent)
100+
if err != nil {
101+
return err
102+
}
103+
defer guestAgent.Close()
104+
_, err = io.Copy(tmpGuestAgent, guestAgent)
105+
if err != nil {
106+
return err
107+
}
108+
tmpGuestAgent.Close()
109+
guestAgentBinary = tmpGuestAgent.Name()
110+
defer os.RemoveAll(guestAgentBinary)
111+
}
81112
tmpname := "lima-guestagent"
82113
tmp, err := shell(sshExe, sshFlags, hostname, "mktemp", "-t", "lima-guestagent.XXXXXX")
83114
if err != nil {
84115
return err
85116
}
86117
bin := prefix + "/bin/lima-guestagent"
87-
logrus.Infof("Copying %q to %s:%s", guestAgentBinary, inst.Name, tmpname)
118+
logrus.Infof("Copying %q to %s:%s", guestAgentFilename, inst.Name, tmpname)
88119
scpArgs := []string{guestAgentBinary, hostname + ":" + tmp}
89120
if err := runCmd(scpExe, scpFlags, scpArgs...); err != nil {
90121
return nil

0 commit comments

Comments
 (0)