Skip to content

GitLab

S
systemd
Commit 18b754d3 authored by Kay Sievers's avatar Kay Sievers
Browse files
Options

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

parent bbd1a837
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 57 deletions
Makefile.am
View file @ 18b754d3
......@@ -685,24 +685,18 @@ MANPAGES = \
man/sysctl.d.5 \
man/systemd-ask-password.1 \
man/systemd-cat.1 \
man/systemd-machine-id-setup.1 \
man/systemd-journald.conf.5 \
man/journalctl.1
man/systemd-machine-id-setup.1 \
man/journald.conf.5 \
man/journalctl.1
MANPAGES_ALIAS = \
man/reboot.8 \
man/poweroff.8 \
man/init.1 \
man/systemd-systemctl.1 \
man/systemd-loginctl.1 \
man/systemd-journalctl.1
man/init.1
man/reboot.8: man/halt.8
man/poweroff.8: man/halt.8
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 = \
${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 \
$(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 = \
src/notify.c \
src/readahead/sd-readahead.c
......@@ -1238,14 +1224,6 @@ journalctl_LDADD += \
$(XZ_LIBS)
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 = \
src/journal/test-journal.c \
src/journal/sd-journal.c \
......@@ -1344,7 +1322,7 @@ nodist_systemunit_DATA += \
units/systemd-journald.service
dist_pkgsysconf_DATA += \
src/journal/systemd-journald.conf
src/journal/journald.conf
pkgconfiglib_DATA += \
src/journal/libsystemd-journal.pc
......@@ -1853,14 +1831,6 @@ loginctl_LDADD = \
rootbin_PROGRAMS += \
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 = \
src/login/test-login.c
......@@ -1945,7 +1915,7 @@ dist_dbuspolicy_DATA += \
src/login/org.freedesktop.login1.conf
dist_pkgsysconf_DATA += \
src/login/systemd-logind.conf
src/login/logind.conf
pkginclude_HEADERS += \
src/systemd/sd-login.h
......@@ -2022,7 +1992,7 @@ nodist_udevrules_DATA += \
src/login/73-seat-late.rules
MANPAGES += \
man/systemd-logind.conf.5 \
man/logind.conf.5 \
man/sd-login.7 \
man/loginctl.1 \
man/sd_login_monitor_new.3 \
......
NEWS
View file @ 18b754d3
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:
* This is mostly a bugfix release
......
TODO
View file @ 18b754d3
......@@ -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.
Features:
* cleanup syslog 'priority' vs. 'level' wording
* dbus upstream still refers to dbus.target and shouldn't
......
man/journalctl.xml
View file @ 18b754d3
......@@ -44,7 +44,6 @@
<refnamediv>
<refname>journalctl</refname>
<refname>systemd-journalctl</refname>
<refpurpose>Query the systemd journal</refpurpose>
</refnamediv>
......@@ -254,7 +253,7 @@
<para>
<citerefentry><refentrytitle>systemd</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>
</refsect1>
......
man/systemd-journald.conf.xml → man/journald.conf.xml
View file @ 18b754d3
......@@ -22,9 +22,9 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
-->
<refentry id="systemd-journald.conf">
<refentry id="journald.conf">
<refentryinfo>
<title>systemd-journald.conf</title>
<title>journald.conf</title>
<productname>systemd</productname>
<authorgroup>
......@@ -38,17 +38,17 @@
</refentryinfo>
<refmeta>
<refentrytitle>systemd-journald.conf</refentrytitle>
<refentrytitle>journald.conf</refentrytitle>
<manvolnum>5</manvolnum>
</refmeta>
<refnamediv>
<refname>systemd-journald.conf</refname>
<refname>journald.conf</refname>
<refpurpose>Journal service configuration file</refpurpose>
</refnamediv>
<refsynopsisdiv>
<para><filename>systemd-journald.conf</filename></para>
<para><filename>journald.conf</filename></para>
</refsynopsisdiv>
<refsect1>
......
man/loginctl.xml
View file @ 18b754d3
......@@ -44,7 +44,6 @@
<refnamediv>
<refname>loginctl</refname>
<refname>systemd-loginctl</refname>
<refpurpose>Control the systemd login manager</refpurpose>
</refnamediv>
......@@ -451,7 +450,7 @@
<para>
<citerefentry><refentrytitle>systemd</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>
</refsect1>
......
man/systemd-logind.conf.xml → man/logind.conf.xml
View file @ 18b754d3
......@@ -22,9 +22,9 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
-->
<refentry id="systemd-logind.conf">
<refentry id="logind.conf">
<refentryinfo>
<title>systemd-logind.conf</title>
<title>logind.conf</title>
<productname>systemd</productname>
<authorgroup>
......@@ -38,17 +38,17 @@
</refentryinfo>
<refmeta>
<refentrytitle>systemd-logind.conf</refentrytitle>
<refentrytitle>logind.conf</refentrytitle>
<manvolnum>5</manvolnum>
</refmeta>
<refnamediv>
<refname>systemd-logind.conf</refname>
<refname>logind.conf</refname>
<refpurpose>Login manager configuration file</refpurpose>
</refnamediv>
<refsynopsisdiv>
<para><filename>systemd-logind.conf</filename></para>
<para><filename>logind.conf</filename></para>
</refsynopsisdiv>
<refsect1>
......
man/pam_systemd.xml
View file @ 18b754d3
......@@ -212,7 +212,7 @@
stricter version of
<varname>KillUserProcesses=1</varname> which may be
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
ends, the latter kills processes as soon as the last
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</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>
</para>
</refsect1>
......
man/systemctl.xml
View file @ 18b754d3
......@@ -44,7 +44,6 @@
<refnamediv>
<refname>systemctl</refname>
<refname>systemd-systemctl</refname>
<refpurpose>Control the systemd system and service manager</refpurpose>
</refnamediv>
......
src/journal/journald.c
View file @ 18b754d3
......@@ -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)
......
src/login/logind.c
View file @ 18b754d3
......@@ -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)
......
src/login/systemd-logind.conf → src/login/logind.conf
View file @ 18b754d3
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment