From 18b754d345ecb0b15e369978aaffa72e9814b86a Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers@vrfy.org>
Date: Fri, 30 Mar 2012 23:18:33 +0200
Subject: rename /etc/systemd/systemd-{login,journal}d.conf to
 {login,journal}d.conf

---
 src/journal/journald.c            |  2 +-
 src/journal/journald.conf         | 25 +++++++++++++++++++++++++
 src/journal/systemd-journald.conf | 25 -------------------------
 src/login/logind.c                |  2 +-
 src/login/logind.conf             | 16 ++++++++++++++++
 src/login/systemd-logind.conf     | 16 ----------------
 6 files changed, 43 insertions(+), 43 deletions(-)
 create mode 100644 src/journal/journald.conf
 delete mode 100644 src/journal/systemd-journald.conf
 create mode 100644 src/login/logind.conf
 delete mode 100644 src/login/systemd-logind.conf

(limited to 'src')

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/journald.conf b/src/journal/journald.conf
new file mode 100644
index 0000000000..710b0aa941
--- /dev/null
+++ b/src/journal/journald.conf
@@ -0,0 +1,25 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+# See system-journald.conf(5) for details
+
+[Journal]
+#Compress=yes
+#RateLimitInterval=10s
+#RateLimitBurst=200
+#SystemMaxUse=
+#SystemKeepFree=
+#SystemMaxFileSize=
+#SystemMinFileSize=
+#RuntimeMaxUse=
+#RuntimeKeepFree=
+#RuntimeMaxFileSize=
+#RuntimeMinFileSize=
+#ForwardToSyslog=yes
+#ForwardToKMsg=no
+#ForwardToConsole=no
+#ImportKernel=yes
diff --git a/src/journal/systemd-journald.conf b/src/journal/systemd-journald.conf
deleted file mode 100644
index 710b0aa941..0000000000
--- a/src/journal/systemd-journald.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-# See system-journald.conf(5) for details
-
-[Journal]
-#Compress=yes
-#RateLimitInterval=10s
-#RateLimitBurst=200
-#SystemMaxUse=
-#SystemKeepFree=
-#SystemMaxFileSize=
-#SystemMinFileSize=
-#RuntimeMaxUse=
-#RuntimeKeepFree=
-#RuntimeMaxFileSize=
-#RuntimeMinFileSize=
-#ForwardToSyslog=yes
-#ForwardToKMsg=no
-#ForwardToConsole=no
-#ImportKernel=yes
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/logind.conf b/src/login/logind.conf
new file mode 100644
index 0000000000..24b9d77a67
--- /dev/null
+++ b/src/login/logind.conf
@@ -0,0 +1,16 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+# See logind.conf(5) for details
+
+[Login]
+#NAutoVTs=6
+#KillUserProcesses=no
+#KillOnlyUsers=
+#KillExcludeUsers=root
+#Controllers=
+#ResetControllers=cpu
diff --git a/src/login/systemd-logind.conf b/src/login/systemd-logind.conf
deleted file mode 100644
index a8d9833507..0000000000
--- a/src/login/systemd-logind.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-# See systemd-logind.conf(5) for details
-
-[Login]
-#NAutoVTs=6
-#KillUserProcesses=no
-#KillOnlyUsers=
-#KillExcludeUsers=root
-#Controllers=
-#ResetControllers=cpu
-- 
cgit v1.2.3-54-g00ecf