From: Kay Sievers <kay@vrfy.org>
Date: Thu, 19 Jun 2014 16:57:16 +0000 (+0200)
Subject: tmpfiles: do not fail when copying an empty directory
X-Git-Tag: v215~285
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=19f3934057d20c63f4c95791312038a41b4666d0

tmpfiles: do not fail when copying an empty directory
---

diff --git a/src/shared/copy.c b/src/shared/copy.c
index 4c227c8be..073b7279b 100644
--- a/src/shared/copy.c
+++ b/src/shared/copy.c
@@ -203,6 +203,7 @@ static int fd_copy_directory(int df, const char *from, const struct stat *st, in
                         r = -errno;
         }
 
+        r = 0;
         FOREACH_DIRENT(de, d, return -errno) {
                 struct stat buf;
                 int q;
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index 97901220e..c6c8ce8fe 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -669,7 +669,7 @@ static int create_item(Item *i) {
         case COPY_FILES:
                 r = copy_tree(i->argument, i->path);
                 if (r < 0) {
-                        log_error("Failed to copy files: %s", strerror(-r));
+                        log_error("Failed to copy files to %s: %s", i->path, strerror(-r));
                         return r;
                 }