summaryrefslogtreecommitdiff
path: root/src/journal
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2012-03-30 23:18:33 +0200
committerKay Sievers <kay.sievers@vrfy.org>2012-03-30 23:36:44 +0200
commit18b754d345ecb0b15e369978aaffa72e9814b86a (patch)
tree9f8a3610d31a48a3873679acccec37636418aa92 /src/journal
parentbbd1a8374f90605319d0404ebb423795337161bd (diff)
rename /etc/systemd/systemd-{login,journal}d.conf to {login,journal}d.conf
Diffstat (limited to 'src/journal')
-rw-r--r--src/journal/journald.c2
-rw-r--r--src/journal/journald.conf (renamed from src/journal/systemd-journald.conf)0
2 files changed, 1 insertions, 1 deletions
diff --git a/src/journal/journald.c b/src/journal/journald.c
index f0f5103bf0..f341b8742b 100644
--- a/src/journal/journald.c
+++ b/src/journal/journald.c
@@ -2584,7 +2584,7 @@ static int server_parse_config_file(Server *s) {
assert(s);
- fn = "/etc/systemd/systemd-journald.conf";
+ fn = "/etc/systemd/journald.conf";
f = fopen(fn, "re");
if (!f) {
if (errno == ENOENT)
diff --git a/src/journal/systemd-journald.conf b/src/journal/journald.conf
index 710b0aa941..710b0aa941 100644
--- a/src/journal/systemd-journald.conf
+++ b/src/journal/journald.conf