803fb7
From e2550d725cf94c01dee40f5f02ad242ee8e02072 Mon Sep 17 00:00:00 2001
803fb7
From: Lennart Poettering <lennart@poettering.net>
803fb7
Date: Fri, 15 May 2015 21:47:22 +0200
803fb7
Subject: [PATCH] tmpfiles: don't fail if we cannot create a subvolume because
803fb7
 a file system is read-only but a dir already exists anyway
803fb7
803fb7
https://bugs.freedesktop.org/show_bug.cgi?id=90281
803fb7
(cherry picked from commit 7b135a73999b6911ebb85c053b6f7701fdac1883)
803fb7
803fb7
Cherry-picked from: 7b135a7
803fb7
Resolves: #1222517
803fb7
---
803fb7
 src/tmpfiles/tmpfiles.c | 17 +++++++++++------
803fb7
 1 file changed, 11 insertions(+), 6 deletions(-)
803fb7
803fb7
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
803fb7
index 73a9c9d5b..d0e6567d8 100644
803fb7
--- a/src/tmpfiles/tmpfiles.c
803fb7
+++ b/src/tmpfiles/tmpfiles.c
803fb7
@@ -1002,20 +1002,25 @@ static int create_item(Item *i) {
803fb7
                                 r = mkdir_label(i->path, i->mode);
803fb7
 
803fb7
                 if (r < 0) {
803fb7
-                        if (r != -EEXIST)
803fb7
-                                return log_error_errno(r, "Failed to create directory or subvolume \"%s\": %m", i->path);
803fb7
+                        int k;
803fb7
 
803fb7
-                        if (stat(i->path, &st) < 0)
803fb7
-                                return log_error_errno(errno, "stat(%s) failed: %m", i->path);
803fb7
+                        if (r != -EEXIST && r != -EROFS)
803fb7
+                                return log_error_errno(r, "Failed to create directory or subvolume \"%s\": %m", i->path);
803fb7
 
803fb7
-                        if (!S_ISDIR(st.st_mode)) {
803fb7
-                                log_debug("\"%s\" already exists and is not a directory.", i->path);
803fb7
+                        k = is_dir(i->path, false);
803fb7
+                        if (k == -ENOENT && r == -EROFS)
803fb7
+                                return log_error_errno(r, "%s does not exist and cannot be created as the file system is read-only.", i->path);
803fb7
+                        if (k < 0)
803fb7
+                                return log_error_errno(k, "Failed to check if %s exists: %m", i->path);
803fb7
+                        if (!k) {
803fb7
+                                log_warning("\"%s\" already exists and is not a directory.", i->path);
803fb7
                                 return 0;
803fb7
                         }
803fb7
 
803fb7
                         creation = CREATION_EXISTING;
803fb7
                 } else
803fb7
                         creation = CREATION_NORMAL;
803fb7
+
803fb7
                 log_debug("%s directory \"%s\".", creation_mode_verb_to_string(creation), i->path);
803fb7
 
803fb7
                 r = path_set_perms(i, i->path);