X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ftmpfiles.c;h=984eaf0de192538f0209fa3880a8b03ab8f3f86d;hb=2c4b304e64ca674e1a79a7e5c83a996a03611a17;hp=1234cbf3480c9c1bc190dfdfe3c3a768cba0e66f;hpb=a247755d5221411ffe7780677b270963682dadd1;p=elogind.git

diff --git a/src/tmpfiles.c b/src/tmpfiles.c
index 1234cbf34..984eaf0de 100644
--- a/src/tmpfiles.c
+++ b/src/tmpfiles.c
@@ -591,6 +591,12 @@ static int parse_line(const char *fname, unsigned line, const char *buffer, cons
         }
 
         if ((r = hashmap_put(items, i->path, i)) < 0) {
+                if (r == -EEXIST) {
+                        log_warning("Two or more conflicting lines for %s configured, ignoring.", i->path);
+                        r = 0;
+                        goto finish;
+                }
+
                 log_error("Failed to insert item %s: %s", i->path, strerror(-r));
                 goto finish;
         }