diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-08-26 08:51:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-26 08:51:55 -0400 |
| commit | 03e51a058d35820fe8a9a9050b438f9db021ce11 (patch) | |
| tree | 6e7a69a16ec3c760350619795a60791248416885 | |
| parent | b1247b62bddd96a02741499cc63427866290e5a1 (diff) | |
| parent | 61fc1870ad230243cf7a8c9f251e6d52ec32cc31 (diff) | |
| download | podman-03e51a058d35820fe8a9a9050b438f9db021ce11.tar.gz podman-03e51a058d35820fe8a9a9050b438f9db021ce11.tar.bz2 podman-03e51a058d35820fe8a9a9050b438f9db021ce11.zip | |
Merge pull request #15486 from dfr/freebsd-syslog
cmd/podman: Enable --syslog on FreeBSD
| -rw-r--r-- | cmd/podman/syslog_common.go (renamed from cmd/podman/syslog_linux.go) | 3 | ||||
| -rw-r--r-- | cmd/podman/syslog_unsupported.go | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/cmd/podman/syslog_linux.go b/cmd/podman/syslog_common.go index ac7bbfe0f..e035e6365 100644 --- a/cmd/podman/syslog_linux.go +++ b/cmd/podman/syslog_common.go @@ -1,3 +1,6 @@ +//go:build linux || freebsd +// +build linux freebsd + package main import ( diff --git a/cmd/podman/syslog_unsupported.go b/cmd/podman/syslog_unsupported.go index 42a7851ab..365e5b2b4 100644 --- a/cmd/podman/syslog_unsupported.go +++ b/cmd/podman/syslog_unsupported.go @@ -1,5 +1,5 @@ -//go:build !linux -// +build !linux +//go:build !linux && !freebsd +// +build !linux,!freebsd package main |