chiark / gitweb /
tmpfiles: nicer message when two or more conflicting lines are configured for the...
authorLennart Poettering <lennart@poettering.net>
Wed, 5 Jan 2011 15:11:15 +0000 (16:11 +0100)
committerLennart Poettering <lennart@poettering.net>
Wed, 5 Jan 2011 15:11:15 +0000 (16:11 +0100)
src/tmpfiles.c

index 1234cbf..984eaf0 100644 (file)
@@ -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;
         }