mirror of
https://github.com/containers/podman.git
synced 2025-12-06 05:37:49 +08:00
vendor: update github.com/opencontainers/runc to main
it is not possible yet to drop the override since the latest released version has an indirect dependency on github.com/cilium/ebpf that causes the binary to grow by ~1MB. Once there is a new runc version, we can drop the override. For now just bump to the latest version on main, since we are using a year old version at this point. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
6
vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/paths.go
generated
vendored
6
vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/paths.go
generated
vendored
@@ -83,6 +83,7 @@ func tryDefaultCgroupRoot() string {
|
||||
if err != nil {
|
||||
return ""
|
||||
}
|
||||
defer dir.Close()
|
||||
names, err := dir.Readdirnames(1)
|
||||
if err != nil {
|
||||
return ""
|
||||
@@ -164,9 +165,8 @@ func subsysPath(root, inner, subsystem string) (string, error) {
|
||||
return filepath.Join(root, filepath.Base(mnt), inner), nil
|
||||
}
|
||||
|
||||
// Use GetOwnCgroupPath instead of GetInitCgroupPath, because the creating
|
||||
// process could in container and shared pid namespace with host, and
|
||||
// /proc/1/cgroup could point to whole other world of cgroups.
|
||||
// Use GetOwnCgroupPath for dind-like cases, when cgroupns is not
|
||||
// available. This is ugly.
|
||||
parentPath, err := cgroups.GetOwnCgroupPath(subsystem)
|
||||
if err != nil {
|
||||
return "", err
|
||||
|
||||
Reference in New Issue
Block a user