From 5d42886c72d7cc129d7f8be793e4ac77e31dfdb3 Mon Sep 17 00:00:00 2001 From: Maciej Borzecki Date: Wed, 11 Sep 2019 09:59:38 +0200 Subject: cmd/libsnap-confine-private: tweak cgroup v2 detection Signed-off-by: Maciej Borzecki --- cmd/libsnap-confine-private/cgroup-support.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cmd/libsnap-confine-private/cgroup-support.c b/cmd/libsnap-confine-private/cgroup-support.c index c345911616..7ddb672266 100644 --- a/cmd/libsnap-confine-private/cgroup-support.c +++ b/cmd/libsnap-confine-private/cgroup-support.c @@ -82,11 +82,13 @@ bool sc_cgroup_is_v2() { static bool did_warn = false; struct statfs buf; - int err = statfs(cgroup_dir, &buf); - if (err != 0 && errno != ENOENT) { + if (statfs(cgroup_dir, &buf) != 0) { + if (errno == ENOENT) { + return false; + } die("cannot statfs %s", cgroup_dir); } - if (err == 0 && buf.f_type == CGROUP2_SUPER_MAGIC) { + if (buf.f_type == CGROUP2_SUPER_MAGIC) { if (!did_warn) { fprintf(stderr, "WARNING: cgroup v2 is not fully supported yet\n"); did_warn = true; -- cgit v1.2.3