summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2012-11-16 23:08:27 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2012-11-16 23:29:18 +0100
commit4ec24515daa780118709e04cd78dae93f25a8428 (patch)
treeefe4f28261d081632f0c3134b8709b2d363f749b /src
parent943aad8ca57a6b5c49c4ea60f9e8c13bf9b20e6c (diff)
journal: use $(localstatedir)/lib/systemd/catalog for the catalog
The path doesn't change in the standard configuration. Also, give full path to the journalctl binary in the hook, since it might be installed outside of $PATH. Also, add uninstall hook to remove the binary catalog.
Diffstat (limited to 'src')
-rw-r--r--src/journal/catalog.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/journal/catalog.c b/src/journal/catalog.c
index 2812d5970b..3735ad9213 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) {
@@ -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;