diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-08-29 06:27:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-29 06:27:24 -0400 |
| commit | 3a6342062821cec7670bd9b4a5f3234866a8ed8e (patch) | |
| tree | c01069fd6d22ed3ad28ce20ba6925aad80b607b7 | |
| parent | 7287f9e49aeca46e73988ff60e4e0dbc9f218ead (diff) | |
| parent | 0b3184a5acb68043a6cf44b7c223d84d8badd930 (diff) | |
| download | podman-3a6342062821cec7670bd9b4a5f3234866a8ed8e.tar.gz podman-3a6342062821cec7670bd9b4a5f3234866a8ed8e.tar.bz2 podman-3a6342062821cec7670bd9b4a5f3234866a8ed8e.zip | |
Merge pull request #15500 from dfr/freebsd-terminal
pkg/domain: Add terminal support for FreeBSD
| -rw-r--r-- | pkg/domain/infra/abi/terminal/sigproxy_commn.go (renamed from pkg/domain/infra/abi/terminal/sigproxy_linux.go) | 3 | ||||
| -rw-r--r-- | pkg/domain/infra/abi/terminal/terminal_common.go (renamed from pkg/domain/infra/abi/terminal/terminal_linux.go) | 3 | ||||
| -rw-r--r-- | pkg/domain/infra/abi/terminal/terminal_unsupported.go | 4 |
3 files changed, 8 insertions, 2 deletions
diff --git a/pkg/domain/infra/abi/terminal/sigproxy_linux.go b/pkg/domain/infra/abi/terminal/sigproxy_commn.go index 16d345f06..3a0132ef3 100644 --- a/pkg/domain/infra/abi/terminal/sigproxy_linux.go +++ b/pkg/domain/infra/abi/terminal/sigproxy_commn.go @@ -1,3 +1,6 @@ +//go:build linux || freebsd +// +build linux freebsd + package terminal import ( diff --git a/pkg/domain/infra/abi/terminal/terminal_linux.go b/pkg/domain/infra/abi/terminal/terminal_common.go index 222590871..afae2c085 100644 --- a/pkg/domain/infra/abi/terminal/terminal_linux.go +++ b/pkg/domain/infra/abi/terminal/terminal_common.go @@ -1,3 +1,6 @@ +//go:build linux || freebsd +// +build linux freebsd + package terminal import ( diff --git a/pkg/domain/infra/abi/terminal/terminal_unsupported.go b/pkg/domain/infra/abi/terminal/terminal_unsupported.go index 8fe325736..21ed6c8d4 100644 --- a/pkg/domain/infra/abi/terminal/terminal_unsupported.go +++ b/pkg/domain/infra/abi/terminal/terminal_unsupported.go @@ -1,5 +1,5 @@ -//go:build !linux -// +build !linux +//go:build !linux && !freebsd +// +build !linux,!freebsd package terminal |