Skip to content

Commit 483a694

Browse files
authored
Merge pull request #4301 from jandubois/info-usrlocal
Add libexecPaths to `limactl info` output
2 parents 939292a + 89fde20 commit 483a694

File tree

1 file changed

+18
-8
lines changed

1 file changed

+18
-8
lines changed

pkg/limainfo/limainfo.go

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,16 @@ type LimaInfo struct {
2929
Templates []templatestore.Template `json:"templates"`
3030
DefaultTemplate *limatype.LimaYAML `json:"defaultTemplate"`
3131
LimaHome string `json:"limaHome"`
32-
VMTypes []string `json:"vmTypes"` // since Lima v0.14.2
33-
VMTypesEx map[string]DriverExt `json:"vmTypesEx"` // since Lima v2.0.0
34-
GuestAgents map[limatype.Arch]GuestAgent `json:"guestAgents"` // since Lima v1.1.0
35-
ShellEnvBlock []string `json:"shellEnvBlock"`
36-
HostOS string `json:"hostOS"` // since Lima v2.0.0
37-
HostArch string `json:"hostArch"` // since Lima v2.0.0
38-
IdentityFile string `json:"identityFile"` // since Lima v2.0.0
39-
Plugins []plugins.Plugin `json:"plugins"` // since Lima v2.0.0
32+
VMTypes []string `json:"vmTypes"` // since Lima v0.14.2
33+
VMTypesEx map[string]DriverExt `json:"vmTypesEx"` // since Lima v2.0.0
34+
GuestAgents map[limatype.Arch]GuestAgent `json:"guestAgents"` // since Lima v1.1.0
35+
ShellEnvBlock []string `json:"shellEnvBlock"` // since Lima v2.0.0
36+
HostOS string `json:"hostOS"` // since Lima v2.0.0
37+
HostArch string `json:"hostArch"` // since Lima v2.0.0
38+
IdentityFile string `json:"identityFile"` // since Lima v2.0.0
39+
Plugins []plugins.Plugin `json:"plugins"` // since Lima v2.0.0
40+
LibexecPaths []string `json:"libexecPaths"` // since Lima v2.0.0
41+
SharePaths []string `json:"sharePaths"` // since Lima v2.0.0
4042
}
4143

4244
type DriverExt struct {
@@ -95,6 +97,14 @@ func New(ctx context.Context) (*LimaInfo, error) {
9597
if err != nil {
9698
return nil, err
9799
}
100+
info.LibexecPaths, err = usrlocal.LibexecLima()
101+
if err != nil {
102+
return nil, err
103+
}
104+
info.SharePaths, err = usrlocal.ShareLima()
105+
if err != nil {
106+
return nil, err
107+
}
98108
info.IdentityFile = filepath.Join(configDir, filenames.UserPrivateKey)
99109
for _, arch := range limatype.ArchTypes {
100110
bin, err := usrlocal.GuestAgentBinary(limatype.LINUX, arch)

0 commit comments

Comments
 (0)