Skip to content

Commit d48bf06

Browse files
committed
Don't support cgroupns on cgroups v1
Fixes #4108 Signed-off-by: Mark Yen <[email protected]>
1 parent 0e662b6 commit d48bf06

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

executor/oci/spec_linux.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,13 @@ func getTracingSocket() string {
150150

151151
func cgroupNamespaceSupported() bool {
152152
cgroupNSOnce.Do(func() {
153-
if _, err := os.Stat("/proc/self/ns/cgroup"); !os.IsNotExist(err) {
154-
supportsCgroupNS = true
153+
if _, err := os.Stat("/proc/self/ns/cgroup"); os.IsNotExist(err) {
154+
return
155155
}
156+
if _, err := os.Stat("/sys/fs/cgroup/cgroup.subtree_control"); os.IsNotExist(err) {
157+
return
158+
}
159+
supportsCgroupNS = true
156160
})
157161
return supportsCgroupNS
158162
}

0 commit comments

Comments
 (0)