shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-22 13:33:56 +03:00
Code

man: rename systemd.conf to systemd-system.conf

Browse Source 
Alias as systemd-user.conf is also provided. This should help
users running systemd in session mode.

https://bugzilla.redhat.com/show_bug.cgi?id=690868
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2013-02-11 14:42:24 -05:00
parent a7f5bb1eaf
commit 5f9cfd4c38
10 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile-man.am
View File

@ -1,5 +1,5 @@
# Do not edit. Generated by make-man-rules.py.
# Regenerate with 'make man-list-update'.
# Regenerate with 'make update-man-list'.
MANPAGES += \
man/bootup.7 \
@ -67,13 +67,13 @@ MANPAGES += \
man/systemd-suspend.service.8 \
man/systemd-sysctl.service.8 \
man/systemd-system-update-generator.8 \
man/systemd-system.conf.5 \
man/systemd-tmpfiles.8 \
man/systemd-tty-ask-password-agent.1 \
man/systemd-udevd.service.8 \
man/systemd-update-utmp-runlevel.service.8 \
man/systemd.1 \
man/systemd.automount.5 \
man/systemd.conf.5 \
man/systemd.device.5 \
man/systemd.exec.5 \
man/systemd.journal-fields.7 \
@ -187,7 +187,8 @@ MANPAGES_ALIAS += \
man/systemd-udevd-kernel.socket.8 \
man/systemd-udevd.8 \
man/systemd-update-utmp-shutdown.service.8 \
man/systemd-update-utmp.8
man/systemd-update-utmp.8 \
man/systemd-user.conf.5
man/SD_ALERT.3: man/sd-daemon.3
man/SD_CRIT.3: man/sd-daemon.3
man/SD_DEBUG.3: man/sd-daemon.3
@ -281,6 +282,7 @@ man/systemd-udevd-kernel.socket.8: man/systemd-udevd.service.8
man/systemd-udevd.8: man/systemd-udevd.service.8
man/systemd-update-utmp-shutdown.service.8: man/systemd-update-utmp-runlevel.service.8
man/systemd-update-utmp.8: man/systemd-update-utmp-runlevel.service.8
man/systemd-user.conf.5: man/systemd-system.conf.5
if ENABLE_BINFMT
MANPAGES += \

2
man/journald.conf.xml
View File

@ -404,7 +404,7 @@
<citerefentry><refentrytitle>systemd-journald.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
<citerefentry><refentrytitle>journalctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd.journal-fields</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
<citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
</para>
</refsect1>

2
man/logind.conf.xml
View File

@ -329,7 +329,7 @@
<citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd-logind.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
<citerefentry><refentrytitle>loginctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
<citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
</para>
</refsect1>

2
man/systemd-cgtop.xml
View File

@ -78,7 +78,7 @@
<literal>blkio</literal> and <literal>memory</literal>
to the <varname>DefaultControllers=</varname> setting
in <filename>/etc/systemd/system.conf</filename> (see
<citerefentry><refentrytitle>systemd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
<citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
for details). Alternatively, it is possible to enable
resource accounting individually for services, by
making use of the <varname>ControlGroup=</varname>

11
man/systemd.conf.xml → man/systemd-system.conf.xml
View File

@ -22,9 +22,9 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
-->
<refentry id="systemd.conf">
<refentry id="systemd-system.conf">
<refentryinfo>
<title>systemd.conf</title>
<title>systemd-system.conf</title>
<productname>systemd</productname>
<authorgroup>
@ -38,13 +38,14 @@
</refentryinfo>
<refmeta>
<refentrytitle>systemd.conf</refentrytitle>
<refentrytitle>systemd-system.conf</refentrytitle>
<manvolnum>5</manvolnum>
</refmeta>
<refnamediv>
<refname>systemd.conf</refname>
<refpurpose>System and service manager configuration file</refpurpose>
<refname>systemd-system.conf</refname>
<refname>systemd-user.conf</refname>
<refpurpose>System and session service manager configuration file</refpurpose>
</refnamediv>
<refsynopsisdiv>

6
man/systemd.exec.xml
View File

@ -462,7 +462,7 @@
with
<option>DefaultStandardOutput=</option>
in
<citerefentry><refentrytitle>systemd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
which defaults to
<option>journal</option>.</para></listitem>
</varlistentry>
@ -481,7 +481,7 @@
setting defaults to the value set with
<option>DefaultStandardError=</option>
in
<citerefentry><refentrytitle>systemd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
which defaults to
<option>inherit</option>.</para></listitem>
</varlistentry>
@ -839,7 +839,7 @@
settings of
<varname>DefaultControllers=</varname>
of
<citerefentry><refentrytitle>systemd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
but a unit's
<varname>ControlGroup=</varname>
setting for a specific controller

4
man/systemd.xml
View File

@ -78,7 +78,7 @@
the configuration file
<filename>system.conf</filename>, otherwise
<filename>user.conf</filename>. See
<citerefentry><refentrytitle>systemd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
<citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
for more information.</para>
</refsect1>
@ -1258,7 +1258,7 @@
<refsect1>
<title>See Also</title>
<para>
<citerefentry><refentrytitle>systemd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
<citerefentry><refentrytitle>locale.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>journalctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,

2
src/core/system.conf
View File

@ -5,7 +5,7 @@
# the Free Software Foundation; either version 2.1 of the License, or
# (at your option) any later version.
#
# See systemd.conf(5) for details
# See systemd-system.conf(5) for details
[Manager]
#LogLevel=info

2
src/core/user.conf
View File

@ -5,7 +5,7 @@
# the Free Software Foundation; either version 2.1 of the License, or
# (at your option) any later version.
#
# See systemd.conf(5) for details
# See systemd-user.conf(5) for details
[Manager]
#LogLevel=info

2
src/shared/env-util.c
View File

@ -108,7 +108,7 @@ bool env_assignment_is_valid(const char *e) {
/* POSIX says the overall size of the environment block cannot
* be > ARG_MAX, hence the individual variable assignments
* cannot be either, but let's room for one trailing NUL
* cannot be either, but let's leave room for one trailing NUL
* byte. */
if (strlen(e) > ARG_MAX - 1)
return false;