From 19f3934057d20c63f4c95791312038a41b4666d0 Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay@vrfy.org>
Date: Thu, 19 Jun 2014 18:57:16 +0200
Subject: tmpfiles: do not fail when copying an empty directory

---
 src/shared/copy.c       | 1 +
 src/tmpfiles/tmpfiles.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/shared/copy.c b/src/shared/copy.c
index 4c227c8bee..073b7279b4 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 97901220e4..c6c8ce8fee 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;
                 }
 
-- 
cgit v1.2.3-54-g00ecf