shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-11 05:17:44 +03:00
Code

rename /etc/systemd/systemd-{login,journal}d.conf to {login,journal}d.conf

Browse Source
This commit is contained in:
Kay Sievers 2012-03-30 23:18:33 +02:00
parent bbd1a8374f
commit 18b754d345
13 changed files with 34 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
Makefile.am
View File

@ -685,24 +685,18 @@ MANPAGES = \
man/sysctl.d.5 \ man/sysctl.d.5 \
man/systemd-ask-password.1 \ man/systemd-ask-password.1 \
man/systemd-cat.1 \ man/systemd-cat.1 \
man/systemd-machine-id-setup.1 \ man/systemd-machine-id-setup.1 \
man/systemd-journald.conf.5 \ man/journald.conf.5 \
man/journalctl.1 man/journalctl.1
MANPAGES_ALIAS = \ MANPAGES_ALIAS = \
man/reboot.8 \ man/reboot.8 \
man/poweroff.8 \ man/poweroff.8 \
man/init.1 \ man/init.1
man/systemd-systemctl.1 \
man/systemd-loginctl.1 \
man/systemd-journalctl.1
man/reboot.8: man/halt.8 man/reboot.8: man/halt.8
man/poweroff.8: man/halt.8 man/poweroff.8: man/halt.8
man/init.1: man/systemd.1 man/init.1: man/systemd.1
man/systemd-systemctl.1: man/systemctl.1
man/systemd-loginctl.1: man/loginctl.1
man/systemd-journalctl.1: man/journalctl.1
XML_FILES = \ XML_FILES = \
${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}} ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
@ -982,14 +976,6 @@ systemctl_LDADD = \
libsystemd-id128.la \ libsystemd-id128.la \
$(DBUS_LIBS) $(DBUS_LIBS)
systemctl-install-hook:
cd $(DESTDIR)$(rootbindir) && \
rm -f systemd-systemctl && \
$(LN_S) systemctl systemd-systemctl
INSTALL_EXEC_HOOKS += \
systemctl-install-hook
systemd_notify_SOURCES = \ systemd_notify_SOURCES = \
src/notify.c \ src/notify.c \
src/readahead/sd-readahead.c src/readahead/sd-readahead.c
@ -1238,14 +1224,6 @@ journalctl_LDADD += \
$(XZ_LIBS) $(XZ_LIBS)
endif endif
journalctl-install-hook:
cd $(DESTDIR)$(rootbindir) && \
rm -f systemd-journalctl && \
$(LN_S) journalctl systemd-journalctl
INSTALL_EXEC_HOOKS += \
journalctl-install-hook
test_journal_SOURCES = \ test_journal_SOURCES = \
src/journal/test-journal.c \ src/journal/test-journal.c \
src/journal/sd-journal.c \ src/journal/sd-journal.c \
@ -1344,7 +1322,7 @@ nodist_systemunit_DATA += \
units/systemd-journald.service units/systemd-journald.service
dist_pkgsysconf_DATA += \ dist_pkgsysconf_DATA += \
src/journal/systemd-journald.conf src/journal/journald.conf
pkgconfiglib_DATA += \ pkgconfiglib_DATA += \
src/journal/libsystemd-journal.pc src/journal/libsystemd-journal.pc
@ -1853,14 +1831,6 @@ loginctl_LDADD = \
rootbin_PROGRAMS += \ rootbin_PROGRAMS += \
loginctl loginctl
loginctl-install-hook:
cd $(DESTDIR)$(rootbindir) && \
rm -f systemd-loginctl && \
$(LN_S) loginctl systemd-loginctl
INSTALL_EXEC_HOOKS += \
loginctl-install-hook
test_login_SOURCES = \ test_login_SOURCES = \
src/login/test-login.c src/login/test-login.c
@ -1945,7 +1915,7 @@ dist_dbuspolicy_DATA += \
src/login/org.freedesktop.login1.conf src/login/org.freedesktop.login1.conf
dist_pkgsysconf_DATA += \ dist_pkgsysconf_DATA += \
src/login/systemd-logind.conf src/login/logind.conf
pkginclude_HEADERS += \ pkginclude_HEADERS += \
src/systemd/sd-login.h src/systemd/sd-login.h
@ -2022,7 +1992,7 @@ nodist_udevrules_DATA += \
src/login/73-seat-late.rules src/login/73-seat-late.rules
MANPAGES += \ MANPAGES += \
man/systemd-logind.conf.5 \ man/logind.conf.5 \
man/sd-login.7 \ man/sd-login.7 \
man/loginctl.1 \ man/loginctl.1 \
man/sd_login_monitor_new.3 \ man/sd_login_monitor_new.3 \

9
NEWS
View File

@ -1,5 +1,14 @@
systemd System and Service Manager systemd System and Service Manager
CHANGES WITH:
* systemd-logingctl and systemd-journalctl have been renamed
to logingctl and journalctl to match systemctl.
* The config files: /etc/systemd/systemd-logind.conf and
/etc/systemd/systemd-journald.conf have been renamed to
logind.conf and journald.conf. Package updates should rename
the files to the new names on upgrade.
CHANGES WITH 44: CHANGES WITH 44:
* This is mostly a bugfix release * This is mostly a bugfix release

1
TODO
View File

@ -17,6 +17,7 @@ Bugfixes:
* properly handle .mount unit state tracking when two mount points are stacked one on top of another on the exact same mount point. * properly handle .mount unit state tracking when two mount points are stacked one on top of another on the exact same mount point.
Features: Features:
* cleanup syslog 'priority' vs. 'level' wording
* dbus upstream still refers to dbus.target and shouldn't * dbus upstream still refers to dbus.target and shouldn't

3
man/journalctl.xml
View File

@ -44,7 +44,6 @@
<refnamediv> <refnamediv>
<refname>journalctl</refname> <refname>journalctl</refname>
<refname>systemd-journalctl</refname>
<refpurpose>Query the systemd journal</refpurpose> <refpurpose>Query the systemd journal</refpurpose>
</refnamediv> </refnamediv>
@ -254,7 +253,7 @@
<para> <para>
<citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd-journald.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry> <citerefentry><refentrytitle>journald.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
</para> </para>
</refsect1> </refsect1>

10
man/systemd-journald.conf.xml → man/journald.conf.xml
View File

@ -22,9 +22,9 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>. along with systemd; If not, see <http://www.gnu.org/licenses/>.
--> -->
<refentry id="systemd-journald.conf"> <refentry id="journald.conf">
<refentryinfo> <refentryinfo>
<title>systemd-journald.conf</title> <title>journald.conf</title>
<productname>systemd</productname> <productname>systemd</productname>
<authorgroup> <authorgroup>
@ -38,17 +38,17 @@
</refentryinfo> </refentryinfo>
<refmeta> <refmeta>
<refentrytitle>systemd-journald.conf</refentrytitle> <refentrytitle>journald.conf</refentrytitle>
<manvolnum>5</manvolnum> <manvolnum>5</manvolnum>
</refmeta> </refmeta>
<refnamediv> <refnamediv>
<refname>systemd-journald.conf</refname> <refname>journald.conf</refname>
<refpurpose>Journal service configuration file</refpurpose> <refpurpose>Journal service configuration file</refpurpose>
</refnamediv> </refnamediv>
<refsynopsisdiv> <refsynopsisdiv>
<para><filename>systemd-journald.conf</filename></para> <para><filename>journald.conf</filename></para>
</refsynopsisdiv> </refsynopsisdiv>
<refsect1> <refsect1>

3
man/loginctl.xml
View File

@ -44,7 +44,6 @@
<refnamediv> <refnamediv>
<refname>loginctl</refname> <refname>loginctl</refname>
<refname>systemd-loginctl</refname>
<refpurpose>Control the systemd login manager</refpurpose> <refpurpose>Control the systemd login manager</refpurpose>
</refnamediv> </refnamediv>
@ -451,7 +450,7 @@
<para> <para>
<citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd-logind.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry> <citerefentry><refentrytitle>logind.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
</para> </para>
</refsect1> </refsect1>

10
man/systemd-logind.conf.xml → man/logind.conf.xml
View File

@ -22,9 +22,9 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>. along with systemd; If not, see <http://www.gnu.org/licenses/>.
--> -->
<refentry id="systemd-logind.conf"> <refentry id="logind.conf">
<refentryinfo> <refentryinfo>
<title>systemd-logind.conf</title> <title>logind.conf</title>
<productname>systemd</productname> <productname>systemd</productname>
<authorgroup> <authorgroup>
@ -38,17 +38,17 @@
</refentryinfo> </refentryinfo>
<refmeta> <refmeta>
<refentrytitle>systemd-logind.conf</refentrytitle> <refentrytitle>logind.conf</refentrytitle>
<manvolnum>5</manvolnum> <manvolnum>5</manvolnum>
</refmeta> </refmeta>
<refnamediv> <refnamediv>
<refname>systemd-logind.conf</refname> <refname>logind.conf</refname>
<refpurpose>Login manager configuration file</refpurpose> <refpurpose>Login manager configuration file</refpurpose>
</refnamediv> </refnamediv>
<refsynopsisdiv> <refsynopsisdiv>
<para><filename>systemd-logind.conf</filename></para> <para><filename>logind.conf</filename></para>
</refsynopsisdiv> </refsynopsisdiv>
<refsect1> <refsect1>

4
man/pam_systemd.xml
View File

@ -212,7 +212,7 @@
stricter version of stricter version of
<varname>KillUserProcesses=1</varname> which may be <varname>KillUserProcesses=1</varname> which may be
configured system-wide in configured system-wide in
<citerefentry><refentrytitle>systemd-logind.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>. The <citerefentry><refentrytitle>logind.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>. The
former kills processes of a session as soon as it former kills processes of a session as soon as it
ends, the latter kills processes as soon as the last ends, the latter kills processes as soon as the last
session of the user ends.</para> session of the user ends.</para>
@ -308,7 +308,7 @@ session required pam_systemd.so kill-session-processes=1</programlisting>
<citerefentry><refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
<citerefentry><refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
<citerefentry><refentrytitle>pam_loginuid</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>pam_loginuid</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd-logind.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>logind.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry> <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>
</para> </para>
</refsect1> </refsect1>

1
man/systemctl.xml
View File

@ -44,7 +44,6 @@
<refnamediv> <refnamediv>
<refname>systemctl</refname> <refname>systemctl</refname>
<refname>systemd-systemctl</refname>
<refpurpose>Control the systemd system and service manager</refpurpose> <refpurpose>Control the systemd system and service manager</refpurpose>
</refnamediv> </refnamediv>

2
src/journal/journald.c
View File

@ -2584,7 +2584,7 @@ static int server_parse_config_file(Server *s) {
assert(s); assert(s);
fn = "/etc/systemd/systemd-journald.conf"; fn = "/etc/systemd/journald.conf";
f = fopen(fn, "re"); f = fopen(fn, "re");
if (!f) { if (!f) {
if (errno == ENOENT) if (errno == ENOENT)

0
src/journal/systemd-journald.conf → src/journal/journald.conf
View File

2
src/login/logind.c
View File

@ -1216,7 +1216,7 @@ static int manager_parse_config_file(Manager *m) {
assert(m); assert(m);
fn = "/etc/systemd/systemd-logind.conf"; fn = "/etc/systemd/logind.conf";
f = fopen(fn, "re"); f = fopen(fn, "re");
if (!f) { if (!f) {
if (errno == ENOENT) if (errno == ENOENT)

2
src/login/systemd-logind.conf → src/login/logind.conf
View File

@ -5,7 +5,7 @@
# the Free Software Foundation; either version 2 of the License, or # the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version. # (at your option) any later version.
# #
# See systemd-logind.conf(5) for details # See logind.conf(5) for details
[Login] [Login]
#NAutoVTs=6 #NAutoVTs=6