opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-22 09:58:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15530 from dfr/freebsd-conmon

Browse Source 
libpod: Make sure writeConmonPipeData is called on FreeBSD
This commit is contained in:
Daniel J Walsh
2022-08-31 06:10:06 -04:00
committed by GitHub
parent f8a861b0e9 a7d7912029
commit ac7f4ebb6a
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libpod/oci_conmon_freebsd.go
View File

@ -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 // 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 // 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 { 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 return nil
} }