Skip to content

Commit

Permalink
Merge pull request #15530 from dfr/freebsd-conmon
Browse files Browse the repository at this point in the history
libpod: Make sure writeConmonPipeData is called on FreeBSD
  • Loading branch information
rhatdan authored Aug 31, 2022
2 parents f8a861b + a7d7912 commit ac7f4eb
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion libpod/oci_conmon_freebsd.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

0 comments on commit ac7f4eb

Please sign in to comment.