X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fcatalog.c;h=32256f6263a6c43df3e6f07cd238faf87d701d00;hb=1b12a7b5896f94bdf33b3a6661ebabd761ea6adc;hp=2812d5970b0ef5ac9734dc5e7bd0759f5fe24933;hpb=943aad8ca57a6b5c49c4ea60f9e8c13bf9b20e6c;p=elogind.git

diff --git a/src/journal/catalog.c b/src/journal/catalog.c
index 2812d5970..32256f626 100644
--- a/src/journal/catalog.c
+++ b/src/journal/catalog.c
@@ -269,7 +269,6 @@ static int import_file(Hashmap *h, struct strbuf *sb, const char *path) {
         return 0;
 }
 
-#define CATALOG_PATH "/var/lib/systemd/catalog"
 #define CATALOG_DATABASE CATALOG_PATH "/database"
 
 int catalog_update(void) {
@@ -297,7 +296,7 @@ int catalog_update(void) {
                 goto finish;
         }
 
-        r = conf_files_list_strv(&files, ".catalog", (const char **) conf_file_dirs);
+        r = conf_files_list_strv(&files, ".catalog", NULL, (const char **) conf_file_dirs);
         if (r < 0) {
                 log_error("Failed to get catalog files: %s", strerror(-r));
                 goto finish;
@@ -414,7 +413,7 @@ static int open_mmap(int *_fd, struct stat *_st, void **_p) {
         assert(_st);
         assert(_p);
 
-        fd = open("/var/lib/systemd/catalog/database", O_RDONLY|O_CLOEXEC);
+        fd = open(CATALOG_DATABASE, O_RDONLY|O_CLOEXEC);
         if (fd < 0)
                 return -errno;