diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2022-08-31 06:10:06 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-31 06:10:06 -0400 |
| commit | ac7f4ebb6a1fd3afbaea5e5ede9da0e341c4cdfe (patch) | |
| tree | 8487bd10d5c94e2fdd35d65f7093c4ca94726532 | |
| parent | f8a861b0e90ec2f258fe01bf57d6da9fa96e1f97 (diff) | |
| parent | a7d79120299ebd9989db72e5df505e4c854e3837 (diff) | |
| download | podman-ac7f4ebb6a1fd3afbaea5e5ede9da0e341c4cdfe.tar.gz podman-ac7f4ebb6a1fd3afbaea5e5ede9da0e341c4cdfe.tar.bz2 podman-ac7f4ebb6a1fd3afbaea5e5ede9da0e341c4cdfe.zip | |
Merge pull request #15530 from dfr/freebsd-conmon
libpod: Make sure writeConmonPipeData is called on FreeBSD
| -rw-r--r-- | libpod/oci_conmon_freebsd.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libpod/oci_conmon_freebsd.go b/libpod/oci_conmon_freebsd.go index 6f7ac7fc6..d74f2af01 100644 --- a/libpod/oci_conmon_freebsd.go +++ b/libpod/oci_conmon_freebsd.go @@ -19,6 +19,9 @@ func (r *ConmonOCIRuntime) withContainerSocketLabel(ctr *Container, closure func // moveConmonToCgroupAndSignal gets a container's cgroupParent and moves the conmon process to that cgroup // it then signals for conmon to start by sending nonce data down the start fd func (r *ConmonOCIRuntime) moveConmonToCgroupAndSignal(ctr *Container, cmd *exec.Cmd, startFd *os.File) error { - // No equivalent on FreeBSD + // No equivalent to cgroup on FreeBSD, just signal conmon to start + if err := writeConmonPipeData(startFd); err != nil { + return err + } return nil } |