Skip to content

Commit d745036

Browse files
committed
update
Signed-off-by: Lokesh Mandvekar <[email protected]>
1 parent 344d3e0 commit d745036

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

libpod/oci_conmon_linux.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import (
1717
"github.com/containers/podman/v6/pkg/rootless"
1818
runcconfig "github.com/opencontainers/cgroups"
1919
devices "github.com/opencontainers/cgroups/devices/config"
20+
fs2 "github.com/opencontainers/cgroups/fs2"
2021
spec "github.com/opencontainers/runtime-spec/specs-go"
2122
"github.com/opencontainers/selinux/go-selinux"
2223
"github.com/sirupsen/logrus"
@@ -216,10 +217,10 @@ func (r *ConmonOCIRuntime) moveConmonToCgroupAndSignal(ctr *Container, cmd *exec
216217
logrus.StandardLogger().Logf(logLevel, "Failed to add conmon to systemd sandbox cgroup: %v", err)
217218
}
218219
} else {
219-
control, err := cgroups.New(cgroupPath, &cgroupResources)
220+
_, err := cgroups.New(cgroupPath, &cgroupResources)
220221
if err != nil {
221222
logrus.StandardLogger().Logf(logLevel, "Failed to add conmon to cgroupfs sandbox cgroup: %v", err)
222-
} else if err := control.AddPid(cmd.Process.Pid); err != nil {
223+
} else if err := fs2.AddPid(cmd.Process.Pid); err != nil {
223224
// we need to remove this defer and delete the cgroup once conmon exits
224225
// maybe need a conmon monitor?
225226
logrus.StandardLogger().Logf(logLevel, "Failed to add conmon to cgroupfs sandbox cgroup: %v", err)

0 commit comments

Comments
 (0)