Currently, if a non-root user attempts to run ip vrf exec a non-helpful
error is returned:

$ ip vrf exec mgmt bash
Failed to mount cgroup2. Are CGROUPS enabled in your kernel?

Only show the CGROUPS kernel hint for the ENODEV error and for the
rest show the strerror for the errno. So now:

$ ip/ip vrf exec mgmt bash
Failed to mount cgroup2: Operation not permitted

Signed-off-by: David Ahern <d...@cumulusnetworks.com>
---
 lib/fs.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/lib/fs.c b/lib/fs.c
index 644bb486ae8e..12a4657a0bc9 100644
--- a/lib/fs.c
+++ b/lib/fs.c
@@ -80,13 +80,21 @@ char *find_cgroup2_mount(void)
 
        if (mount("none", mnt, CGROUP2_FS_NAME, 0, NULL)) {
                /* EBUSY means already mounted */
-               if (errno != EBUSY) {
+               if (errno == EBUSY)
+                       goto out;
+
+               if (errno == ENODEV) {
                        fprintf(stderr,
                                "Failed to mount cgroup2. Are CGROUPS enabled 
in your kernel?\n");
-                       free(mnt);
-                       return NULL;
+               } else {
+                       fprintf(stderr,
+                               "Failed to mount cgroup2: %s\n",
+                               strerror(errno));
                }
+               free(mnt);
+               return NULL;
        }
+out:
        return mnt;
 }
 
-- 
2.1.4

Reply via email to