diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2012-03-30 23:18:33 +0200 |
|---|---|---|
| committer | Kay Sievers <kay.sievers@vrfy.org> | 2012-03-30 23:36:44 +0200 |
| commit | 18b754d345ecb0b15e369978aaffa72e9814b86a (patch) | |
| tree | 9f8a3610d31a48a3873679acccec37636418aa92 /src | |
| parent | bbd1a8374f90605319d0404ebb423795337161bd (diff) | |
rename /etc/systemd/systemd-{login,journal}d.conf to {login,journal}d.conf
Diffstat (limited to 'src')
| -rw-r--r-- | src/journal/journald.c | 2 | ||||
| -rw-r--r-- | src/journal/journald.conf (renamed from src/journal/systemd-journald.conf) | 0 | ||||
| -rw-r--r-- | src/login/logind.c | 2 | ||||
| -rw-r--r-- | src/login/logind.conf (renamed from src/login/systemd-logind.conf) | 2 |
4 files changed, 3 insertions, 3 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 diff --git a/src/login/logind.c b/src/login/logind.c index 7fd6515ffd..777d91252a 100644 --- a/src/login/logind.c +++ b/src/login/logind.c @@ -1216,7 +1216,7 @@ static int manager_parse_config_file(Manager *m) { assert(m); - fn = "/etc/systemd/systemd-logind.conf"; + fn = "/etc/systemd/logind.conf"; f = fopen(fn, "re"); if (!f) { if (errno == ENOENT) diff --git a/src/login/systemd-logind.conf b/src/login/logind.conf index a8d9833507..24b9d77a67 100644 --- a/src/login/systemd-logind.conf +++ b/src/login/logind.conf @@ -5,7 +5,7 @@ # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # -# See systemd-logind.conf(5) for details +# See logind.conf(5) for details [Login] #NAutoVTs=6 |