tmpfiles: do not fail when copying an empty directory

diff --git a/src/shared/copy.c b/src/shared/copy.c
index 4c227c8bee387a7a8a58b1e1c059c30934a91fa9..073b7279b43ac3b96e95a2d71b3fdd2eb2216b54 100644 (file)
--- 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 97901220e4dd60e86192e0c175da3e4a96356c37..c6c8ce8fee321ba96be65bf2d3dadce33ddd6cc3 100644 (file)
--- 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;
                 }