[systemd-commits] src/tmpfiles

Kay Sievers kay at kemper.freedesktop.org
Thu Jun 12 19:13:23 PDT 2014


 src/tmpfiles/tmpfiles.c |   14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

New commits:
commit 6555ad8e9d0ae2ec65783b33f9a5fbc018da64d4
Author: Kay Sievers <kay at vrfy.org>
Date:   Fri Jun 13 04:11:11 2014 +0200

    tmpfiles: skip mknod() on -EPERM (device cgroup)

diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index f515fe8..df52085 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -792,9 +792,17 @@ static int create_item(Item *i) {
                         label_context_clear();
                 }
 
-                if (r < 0 && errno != EEXIST) {
-                        log_error("Failed to create device node %s: %m", i->path);
-                        return -errno;
+                if (r < 0) {
+                        if (errno == EPERM) {
+                                log_debug("We lack permissions, possibly because of cgroup configuration; "
+                                          "skipping creation of device node %s.", i->path);
+                                return 0;
+                        }
+
+                        if (errno != EEXIST) {
+                                log_error("Failed to create device node %s: %m", i->path);
+                                return -errno;
+                        }
                 }
 
                 if (stat(i->path, &st) < 0) {



More information about the systemd-commits mailing list