From 03d411abc0b8843443eddbcdbdfaf2dec0bbd2bb Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Tue, 5 Dec 2023 17:49:10 +0100 Subject: [PATCH] libpod: split out cgroups call into linux specific file So that we do not cause compile error on freebsd. Signed-off-by: Paul Holzinger --- libpod/oci_conmon_common.go | 3 +-- libpod/oci_conmon_freebsd.go | 4 ++++ libpod/oci_conmon_linux.go | 4 ++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/libpod/oci_conmon_common.go b/libpod/oci_conmon_common.go index c3e68cf060..00a9a69a92 100644 --- a/libpod/oci_conmon_common.go +++ b/libpod/oci_conmon_common.go @@ -23,7 +23,6 @@ import ( "text/template" "time" - "github.com/containers/common/pkg/cgroups" "github.com/containers/common/pkg/config" "github.com/containers/common/pkg/detach" "github.com/containers/common/pkg/resize" @@ -1100,7 +1099,7 @@ func (r *ConmonOCIRuntime) createOCIContainer(ctr *Container, restoreOptions *Co } if ctr.config.CgroupsMode == cgroupSplit { - if err := cgroups.MoveUnderCgroupSubtree("runtime"); err != nil { + if err := moveToRuntimeCgroup(); err != nil { return 0, err } } diff --git a/libpod/oci_conmon_freebsd.go b/libpod/oci_conmon_freebsd.go index e8cf6085a0..344091e74e 100644 --- a/libpod/oci_conmon_freebsd.go +++ b/libpod/oci_conmon_freebsd.go @@ -28,3 +28,7 @@ func (r *ConmonOCIRuntime) moveConmonToCgroupAndSignal(ctr *Container, cmd *exec } return nil } + +func moveToRuntimeCgroup() error { + return errors.New("moveToRuntimeCgroup not supported on freebsd") +} diff --git a/libpod/oci_conmon_linux.go b/libpod/oci_conmon_linux.go index b029b16a56..bc3a67ae55 100644 --- a/libpod/oci_conmon_linux.go +++ b/libpod/oci_conmon_linux.go @@ -326,3 +326,7 @@ func GetLimits(resource *spec.LinuxResources) (runcconfig.Resources, error) { final.Unified = resource.Unified return *final, nil } + +func moveToRuntimeCgroup() error { + return cgroups.MoveUnderCgroupSubtree("runtime") +}