summaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2021-02-10 19:33:34 +0100
committerGiuseppe Scrivano <gscrivan@redhat.com>2021-02-11 09:38:35 +0100
commit9196a5ce36a559cc0d10230194f93a61b40e870a (patch)
treeb005811fc330fe469fe353e2be4fefc292be1bce /utils
parentf4fd25a005ae00afe7574bd4eb9a428a6b5c81dd (diff)
downloadpodman-9196a5ce36a559cc0d10230194f93a61b40e870a.tar.gz
podman-9196a5ce36a559cc0d10230194f93a61b40e870a.tar.bz2
podman-9196a5ce36a559cc0d10230194f93a61b40e870a.zip
utils: ignore unified on cgroupv1 if not present
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'utils')
-rw-r--r--utils/utils_supported.go5
1 files changed, 5 insertions, 0 deletions
diff --git a/utils/utils_supported.go b/utils/utils_supported.go
index dfa0b486a..9a1c82ee6 100644
--- a/utils/utils_supported.go
+++ b/utils/utils_supported.go
@@ -150,6 +150,11 @@ func moveUnderCgroup(cgroup, subtree string, processes []uint32) error {
// If it is not using unified mode, the cgroup v2 hierarchy is
// usually mounted under /sys/fs/cgroup/unified
cgroupRoot = filepath.Join(cgroupRoot, "unified")
+
+ // Ignore the unified mount if it doesn't exist
+ if _, err := os.Stat(cgroupRoot); err != nil && os.IsNotExist(err) {
+ continue
+ }
} else if parts[1] != "" {
// Assume the controller is mounted at /sys/fs/cgroup/$CONTROLLER.
controller := strings.TrimPrefix(parts[1], "name=")