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