Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ find_files_excluding_dir_and_test = $(shell find $(1) ! -type d ! -name '*_test.
FILES_IN_PKG = $(call find_files_excluding_dir_and_test, ./pkg)

# returns a list of files which are dependencies for the command $(1).
dependencis_for_cmd = go.mod $(call find_files_excluding_dir_and_test, ./cmd/$(1)) $(FILES_IN_PKG)
dependencies_for_cmd = go.mod $(call find_files_excluding_dir_and_test, ./cmd/$(1)) $(FILES_IN_PKG)

### Force Building Targets

Expand Down Expand Up @@ -214,7 +214,7 @@ force: # placeholder for force build
# _output/bin/limactl$(exe)

# dependencies for limactl
LIMACTL_DEPS = $(call dependencis_for_cmd,limactl)
LIMACTL_DEPS = $(call dependencies_for_cmd,limactl)
ifeq ($(GOOS),darwin)
LIMACTL_DEPS += vz.entitlements
endif
Expand Down Expand Up @@ -302,7 +302,7 @@ ENVS_$(LINUX_GUESTAGENT_PATH_COMMON)aarch64 = CGO_ENABLED=0 GOOS=linux GOARCH=ar
ENVS_$(LINUX_GUESTAGENT_PATH_COMMON)armv7l = CGO_ENABLED=0 GOOS=linux GOARCH=arm GOARM=7
ENVS_$(LINUX_GUESTAGENT_PATH_COMMON)riscv64 = CGO_ENABLED=0 GOOS=linux GOARCH=riscv64
ENVS_$(LINUX_GUESTAGENT_PATH_COMMON)x86_64 = CGO_ENABLED=0 GOOS=linux GOARCH=amd64
$(ALL_GUESTAGENTS_NOT_COMPRESSED): $(call dependencis_for_cmd,lima-guestagent) $$(call force_build_with_gunzip,$$@) | _output/share/lima
$(ALL_GUESTAGENTS_NOT_COMPRESSED): $(call dependencies_for_cmd,lima-guestagent) $$(call force_build_with_gunzip,$$@) | _output/share/lima
$(ENVS_$@) $(GO_BUILD) -o $@ ./cmd/lima-guestagent
chmod 644 $@
$(LINUX_GUESTAGENT_PATH_COMMON)%.gz: $(LINUX_GUESTAGENT_PATH_COMMON)% $$(call force_build_with_gunzip,$$@)
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/progressbar/progressbar.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ func showProgress() bool {
return false
}

// Both logrous and pb use stderr by default.
// Both logrus and pb use stderr by default.
logFd := os.Stderr.Fd()
return isatty.IsTerminal(logFd) || isatty.IsCygwinTerminal(logFd)
}
2 changes: 1 addition & 1 deletion pkg/vz/network_darwin.go
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ func (c *qemuPacketConn) Read(b []byte) (n int, err error) {

// Write writes a QEMU packet containing the raw packet. Returns (len(b), nil)
// if a packet was written, and (0, err) if a packet was not fully written.
// Errors means the prorocol is broken and the socket must be closed.
// Errors means the protocol is broken and the socket must be closed.
func (c *qemuPacketConn) Write(b []byte) (int, error) {
size := len(b)
header := uint32(size)
Expand Down
6 changes: 3 additions & 3 deletions pkg/vz/vm_darwin.go
Original file line number Diff line number Diff line change
Expand Up @@ -705,9 +705,9 @@ func getMachineIdentifier(driver *driver.BaseDriver) (*vz.GenericMachineIdentifi
}

func bootLoader(driver *driver.BaseDriver) (vz.BootLoader, error) {
linuxBootLoder, err := linuxBootLoader(driver)
if linuxBootLoder != nil {
return linuxBootLoder, nil
linuxBootLoader, err := linuxBootLoader(driver)
if linuxBootLoader != nil {
return linuxBootLoader, nil
} else if !errors.Is(err, os.ErrNotExist) {
return nil, err
}
Expand Down
Loading