[systemd-commits] 3 commits - Makefile-man.am man/journald.conf.xml man/logind.conf.xml man/systemd-cgtop.xml man/systemd.conf.xml man/systemd.exec.xml man/systemd-system.conf.xml man/systemd.xml src/core src/login src/readahead src/shared src/sysctl src/tty-ask-password-agent
Zbigniew Jędrzejewski-Szmek
zbyszek at kemper.freedesktop.org
Wed Feb 13 07:14:23 PST 2013
Makefile-man.am | 8
man/journald.conf.xml | 2
man/logind.conf.xml | 2
man/systemd-cgtop.xml | 2
man/systemd-system.conf.xml | 308 ++++++++++++++++++++
man/systemd.conf.xml | 307 -------------------
man/systemd.exec.xml | 6
man/systemd.xml | 4
src/core/system.conf | 2
src/core/user.conf | 2
src/login/sd-login.c | 3
src/readahead/readahead-common.c | 2
src/shared/ask-password-api.c | 1
src/shared/env-util.c | 2
src/shared/util.c | 1
src/sysctl/sysctl.c | 3
src/tty-ask-password-agent/tty-ask-password-agent.c | 2
17 files changed, 334 insertions(+), 323 deletions(-)
New commits:
commit 2826d14091e43ed3397d862dee79d09d0115c84e
Author: Harald Hoyer <harald at redhat.com>
Date: Wed Feb 13 15:09:36 2013 +0100
log_error() if inotify_add_watch() fails
[zj: Reworded message s/to watch/to add watch on/ to make it clear
that it was the watch init action that failed, and not the
"process of watching". I think this way it'll be clearer to
people who don't know what inotify does.]
diff --git a/src/login/sd-login.c b/src/login/sd-login.c
index b81dddf..865527f 100644
--- a/src/login/sd-login.c
+++ b/src/login/sd-login.c
@@ -733,6 +733,7 @@ _public_ int sd_login_monitor_new(const char *category, sd_login_monitor **m) {
if (!category || streq(category, "seat")) {
k = inotify_add_watch(fd, "/run/systemd/seats/", IN_MOVED_TO|IN_DELETE);
if (k < 0) {
+ log_error("Failed to add watch on /run/systemd/seats/: %m");
close_nointr_nofail(fd);
return -errno;
}
@@ -743,6 +744,7 @@ _public_ int sd_login_monitor_new(const char *category, sd_login_monitor **m) {
if (!category || streq(category, "session")) {
k = inotify_add_watch(fd, "/run/systemd/sessions/", IN_MOVED_TO|IN_DELETE);
if (k < 0) {
+ log_error("Failed to add watch on /run/systemd/sessions/: %m");
close_nointr_nofail(fd);
return -errno;
}
@@ -753,6 +755,7 @@ _public_ int sd_login_monitor_new(const char *category, sd_login_monitor **m) {
if (!category || streq(category, "uid")) {
k = inotify_add_watch(fd, "/run/systemd/users/", IN_MOVED_TO|IN_DELETE);
if (k < 0) {
+ log_error("Failed to add watch on /run/systemd/users/: %m");
close_nointr_nofail(fd);
return -errno;
}
diff --git a/src/readahead/readahead-common.c b/src/readahead/readahead-common.c
index 41aaff0..1599ac1 100644
--- a/src/readahead/readahead-common.c
+++ b/src/readahead/readahead-common.c
@@ -227,7 +227,7 @@ int open_inotify(void) {
mkdir("/run/systemd/readahead", 0755);
if (inotify_add_watch(fd, "/run/systemd/readahead", IN_CREATE) < 0) {
- log_error("Failed to watch /run/systemd/readahead: %m");
+ log_error("Failed to add watch on /run/systemd/readahead: %m");
close_nointr_nofail(fd);
return -errno;
}
diff --git a/src/shared/ask-password-api.c b/src/shared/ask-password-api.c
index 8a0fb89..10e6ae0 100644
--- a/src/shared/ask-password-api.c
+++ b/src/shared/ask-password-api.c
@@ -78,6 +78,7 @@ int ask_password_tty(
}
if (inotify_add_watch(notify, flag_file, IN_ATTRIB /* for the link count */) < 0) {
+ log_error("Failed to add watch on %s: %m", flag_file);
r = -errno;
goto finish;
}
diff --git a/src/shared/util.c b/src/shared/util.c
index d754c83..6ef1914 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -2220,6 +2220,7 @@ int acquire_terminal(
wd = inotify_add_watch(notify, name, IN_CLOSE);
if (wd < 0) {
r = -errno;
+ log_error("Failed to add watch on %s: %m", name);
goto fail;
}
}
diff --git a/src/tty-ask-password-agent/tty-ask-password-agent.c b/src/tty-ask-password-agent/tty-ask-password-agent.c
index 99a626c..276ccf9 100644
--- a/src/tty-ask-password-agent/tty-ask-password-agent.c
+++ b/src/tty-ask-password-agent/tty-ask-password-agent.c
@@ -81,6 +81,7 @@ static int ask_password_plymouth(
}
if (inotify_add_watch(notify, flag_file, IN_ATTRIB /* for the link count */) < 0) {
+ log_error("Failed to add watch on %s: %m", flag_file);
r = -errno;
goto finish;
}
@@ -577,6 +578,7 @@ static int watch_passwords(void) {
}
if (inotify_add_watch(notify, "/run/systemd/ask-password", IN_CLOSE_WRITE|IN_MOVED_TO) < 0) {
+ log_error("Failed to add watch on /run/systemd/ask-password: %m");
r = -errno;
goto finish;
}
commit f04e95ba6b861fc7d00e16d3d912a01aa7d286de
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date: Wed Feb 13 09:55:32 2013 -0500
sysctl: fix uninitalized memory access in error path
src/sysctl/sysctl.c: In function ‘parse_file’:
src/sysctl/sysctl.c:172:41: warning: ‘property’ may be used uninitialized in this function [-Wmaybe-uninitialized]
diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c
index f59a858..a8cbb5a 100644
--- a/src/sysctl/sysctl.c
+++ b/src/sysctl/sysctl.c
@@ -169,7 +169,8 @@ static int parse_file(Hashmap *sysctl_options, const char *path, bool ignore_eno
existing = hashmap_get(sysctl_options, p);
if (existing) {
if (!streq(value, existing))
- log_warning("Two ore more conflicting assignments of %s, ignoring.", property);
+ log_warning("Duplicate assignment of %s in file '%s', ignoring.",
+ p, path);
continue;
}
commit 5f9cfd4c3877fdc68618faf9ae5efb5948e002b6
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date: Mon Feb 11 14:42:24 2013 -0500
man: rename systemd.conf to systemd-system.conf
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
diff --git a/Makefile-man.am b/Makefile-man.am
index ee9a952..e4eb26c 100644
--- a/Makefile-man.am
+++ b/Makefile-man.am
@@ -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 += \
diff --git a/man/journald.conf.xml b/man/journald.conf.xml
index 30523c5..6ba583b 100644
--- a/man/journald.conf.xml
+++ b/man/journald.conf.xml
@@ -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>
diff --git a/man/logind.conf.xml b/man/logind.conf.xml
index d223514..96e5936 100644
--- a/man/logind.conf.xml
+++ b/man/logind.conf.xml
@@ -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>
diff --git a/man/systemd-cgtop.xml b/man/systemd-cgtop.xml
index 7a34512..ad1f0f8 100644
--- a/man/systemd-cgtop.xml
+++ b/man/systemd-cgtop.xml
@@ -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>
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
new file mode 100644
index 0000000..12979d8
--- /dev/null
+++ b/man/systemd-system.conf.xml
@@ -0,0 +1,308 @@
+<?xml version='1.0'?> <!--*-nxml-*-->
+<?xml-stylesheet type="text/xsl" href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+
+<!--
+ This file is part of systemd.
+
+ Copyright 2010 Lennart Poettering
+
+ systemd is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ systemd is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<refentry id="systemd-system.conf">
+ <refentryinfo>
+ <title>systemd-system.conf</title>
+ <productname>systemd</productname>
+
+ <authorgroup>
+ <author>
+ <contrib>Developer</contrib>
+ <firstname>Lennart</firstname>
+ <surname>Poettering</surname>
+ <email>lennart at poettering.net</email>
+ </author>
+ </authorgroup>
+ </refentryinfo>
+
+ <refmeta>
+ <refentrytitle>systemd-system.conf</refentrytitle>
+ <manvolnum>5</manvolnum>
+ </refmeta>
+
+ <refnamediv>
+ <refname>systemd-system.conf</refname>
+ <refname>systemd-user.conf</refname>
+ <refpurpose>System and session service manager configuration file</refpurpose>
+ </refnamediv>
+
+ <refsynopsisdiv>
+ <para><filename>/etc/systemd/system.conf</filename></para>
+ <para><filename>/etc/systemd/user.conf</filename></para>
+ </refsynopsisdiv>
+
+ <refsect1>
+ <title>Description</title>
+
+ <para>When run as system instance systemd reads the
+ configuration file <filename>system.conf</filename>,
+ otherwise <filename>user.conf</filename>. These
+ configuration files contain a few settings controlling
+ basic manager operations.</para>
+
+ </refsect1>
+
+ <refsect1>
+ <title>Options</title>
+
+ <para>All options are configured in the
+ <literal>[Manager]</literal> section:</para>
+
+ <variablelist class='systemd-directives'>
+
+ <varlistentry>
+ <term><varname>LogLevel=</varname></term>
+ <term><varname>LogTarget=</varname></term>
+ <term><varname>LogColor=</varname></term>
+ <term><varname>LogLocation=</varname></term>
+ <term><varname>DumpCore=yes</varname></term>
+ <term><varname>CrashShell=no</varname></term>
+ <term><varname>ShowStatus=yes</varname></term>
+ <term><varname>CrashChVT=1</varname></term>
+ <term><varname>DefaultStandardOutput=journal</varname></term>
+ <term><varname>DefaultStandardError=inherit</varname></term>
+
+ <listitem><para>Configures various
+ parameters of basic manager
+ operation. These options may be
+ overridden by the respective command
+ line arguments. See
+ <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+ for details about these command line
+ arguments.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><varname>CPUAffinity=</varname></term>
+
+ <listitem><para>Configures the initial
+ CPU affinity for the init
+ process. Takes a space-separated list
+ of CPU indexes.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><varname>DefaultControllers=cpu</varname></term>
+
+ <listitem><para>Configures in which
+ cgroup controller hierarchies to
+ create per-service cgroups
+ automatically, in addition to the
+ name=systemd named hierarchy. Defaults
+ to 'cpu'. Takes a space separated list
+ of controller names. Pass an empty
+ string to ensure that systemd does not
+ touch any hierarchies but its
+ own.</para>
+
+ <para>Note that the default value of
+ 'cpu' will make realtime scheduling
+ unavailable to system services. See
+ <ulink
+ url="http://www.freedesktop.org/wiki/Software/systemd/MyServiceCantGetRealtime">My
+ Service Can't Get Realtime!</ulink>
+ for more
+ information.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><varname>JoinControllers=cpu,cpuacct,cpuset net_cls,netprio</varname></term>
+
+ <listitem><para>Configures controllers
+ that shall be mounted in a single
+ hierarchy. By default systemd will
+ mount all controllers which are
+ enabled in the kernel in individual
+ hierarchies, with the exception of
+ those listed in this setting. Takes a
+ space separated list of comma
+ separated controller names, in order
+ to allow multiple joined
+ hierarchies. Defaults to
+ 'cpu,cpuacct'. Pass an empty string to
+ ensure that systemd mounts all
+ controllers in separate
+ hierarchies.</para>
+
+ <para>Note that this option is only
+ applied once, at very early boot. If
+ you use an initial RAM disk (initrd)
+ that uses systemd it might hence be
+ necessary to rebuild the initrd if
+ this option is changed, and make sure
+ the new configuration file is included
+ in it. Otherwise the initrd might
+ mount the controller hierachies in a
+ different configuration than intended,
+ and the main system cannot remount
+ them anymore.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><varname>RuntimeWatchdogSec=</varname></term>
+ <term><varname>ShutdownWatchdogSec=</varname></term>
+
+ <listitem><para>Configure the hardware
+ watchdog at runtime and at
+ reboot. Takes a timeout value in
+ seconds (or in other time units if
+ suffixed with <literal>ms</literal>,
+ <literal>min</literal>,
+ <literal>h</literal>,
+ <literal>d</literal>,
+ <literal>w</literal>). If
+ <varname>RuntimeWatchdogSec=</varname>
+ is set to a non-zero value the
+ watchdog hardware
+ (<filename>/dev/watchdog</filename>)
+ will be programmed to automatically
+ reboot the system if it is not
+ contacted within the specified timeout
+ interval. The system manager will
+ ensure to contact it at least once in
+ half the specified timeout
+ interval. This feature requires a
+ hardware watchdog device to be
+ present, as it is commonly the case in
+ embedded and server systems. Not all
+ hardware watchdogs allow configuration
+ of the reboot timeout, in which case
+ the closest available timeout is
+ picked. <varname>ShutdownWatchdogSec=</varname>
+ may be used to configure the hardware
+ watchdog when the system is asked to
+ reboot. It works as a safety net to
+ ensure that the reboot takes place
+ even if a clean reboot attempt times
+ out. By default
+ <varname>RuntimeWatchdogSec=</varname>
+ defaults to 0 (off), and
+ <varname>ShutdownWatchdogSec=</varname>
+ to 10min. These settings have no
+ effect if a hardware watchdog is not
+ available.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><varname>CapabilityBoundingSet=</varname></term>
+
+ <listitem><para>Controls which
+ capabilities to include in the
+ capability bounding set for PID 1 and
+ its children. See
+ <citerefentry><refentrytitle>capabilities</refentrytitle><manvolnum>7</manvolnum></citerefentry>
+ for details. Takes a whitespace
+ separated list of capability names as
+ read by
+ <citerefentry><refentrytitle>cap_from_name</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
+ Capabilities listed will be included
+ in the bounding set, all others are
+ removed. If the list of capabilities
+ is prefixed with ~ all but the listed
+ capabilities will be included, the
+ effect of the assignment
+ inverted. Note that this option also
+ affects the respective capabilities in
+ the effective, permitted and
+ inheritable capability sets. The
+ capability bounding set may also be
+ individually configured for units
+ using the
+ <varname>CapabilityBoundingSet=</varname>
+ directive for units, but note that
+ capabilities dropped for PID 1 cannot
+ be regained in individual units, they
+ are lost for good.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><varname>TimerSlackNSec=</varname></term>
+
+ <listitem><para>Sets the timer slack
+ in nanoseconds for PID 1 which is then
+ inherited to all executed processes,
+ unless overridden individually, for
+ example with the
+ <varname>TimerSlackNSec=</varname>
+ setting in service units (for details
+ see
+ <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>). The
+ timer slack controls the accuracy of
+ wake-ups triggered by timers. See
+ <citerefentry><refentrytitle>prctl</refentrytitle><manvolnum>2</manvolnum></citerefentry>
+ for more information. Note that in
+ contrast to most other time span
+ definitions this parameter takes an
+ integer value in nano-seconds if no
+ unit is specified. The usual time
+ units are understood
+ too.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><varname>DefaultLimitCPU=</varname></term>
+ <term><varname>DefaultLimitFSIZE=</varname></term>
+ <term><varname>DefaultLimitDATA=</varname></term>
+ <term><varname>DefaultLimitSTACK=</varname></term>
+ <term><varname>DefaultLimitCORE=</varname></term>
+ <term><varname>DefaultLimitRSS=</varname></term>
+ <term><varname>DefaultLimitNOFILE=</varname></term>
+ <term><varname>DefaultLimitAS=</varname></term>
+ <term><varname>DefaultLimitNPROC=</varname></term>
+ <term><varname>DefaultLimitMEMLOCK=</varname></term>
+ <term><varname>DefaultLimitLOCKS=</varname></term>
+ <term><varname>DefaultLimitSIGPENDING=</varname></term>
+ <term><varname>DefaultLimitMSGQUEUE=</varname></term>
+ <term><varname>DefaultLimitNICE=</varname></term>
+ <term><varname>DefaultLimitRTPRIO=</varname></term>
+ <term><varname>DefaultLimitRTTIME=</varname></term>
+
+ <listitem><para>These settings control
+ various default resource limits for
+ units. See
+ <citerefentry><refentrytitle>setrlimit</refentrytitle><manvolnum>2</manvolnum></citerefentry>
+ for details. Use the string
+ <varname>infinity</varname> to
+ configure no limit on a specific
+ resource. These settings may be
+ overridden in individual units
+ using the corresponding LimitXXX=
+ directives. Note that these resource
+ limits are only defaults for units,
+ they are not applied to PID 1
+ itself.</para></listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect1>
+
+ <refsect1>
+ <title>See Also</title>
+ <para>
+ <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>systemd.directives</refentrytitle><manvolnum>7</manvolnum></citerefentry>
+ </para>
+ </refsect1>
+
+</refentry>
diff --git a/man/systemd.conf.xml b/man/systemd.conf.xml
deleted file mode 100644
index 8c8fb7d..0000000
--- a/man/systemd.conf.xml
+++ /dev/null
@@ -1,307 +0,0 @@
-<?xml version='1.0'?> <!--*-nxml-*-->
-<?xml-stylesheet type="text/xsl" href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<!--
- This file is part of systemd.
-
- Copyright 2010 Lennart Poettering
-
- systemd is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation; either version 2.1 of the License, or
- (at your option) any later version.
-
- systemd is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with systemd; If not, see <http://www.gnu.org/licenses/>.
--->
-
-<refentry id="systemd.conf">
- <refentryinfo>
- <title>systemd.conf</title>
- <productname>systemd</productname>
-
- <authorgroup>
- <author>
- <contrib>Developer</contrib>
- <firstname>Lennart</firstname>
- <surname>Poettering</surname>
- <email>lennart at poettering.net</email>
- </author>
- </authorgroup>
- </refentryinfo>
-
- <refmeta>
- <refentrytitle>systemd.conf</refentrytitle>
- <manvolnum>5</manvolnum>
- </refmeta>
-
- <refnamediv>
- <refname>systemd.conf</refname>
- <refpurpose>System and service manager configuration file</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
- <para><filename>/etc/systemd/system.conf</filename></para>
- <para><filename>/etc/systemd/user.conf</filename></para>
- </refsynopsisdiv>
-
- <refsect1>
- <title>Description</title>
-
- <para>When run as system instance systemd reads the
- configuration file <filename>system.conf</filename>,
- otherwise <filename>user.conf</filename>. These
- configuration files contain a few settings controlling
- basic manager operations.</para>
-
- </refsect1>
-
- <refsect1>
- <title>Options</title>
-
- <para>All options are configured in the
- <literal>[Manager]</literal> section:</para>
-
- <variablelist class='systemd-directives'>
-
- <varlistentry>
- <term><varname>LogLevel=</varname></term>
- <term><varname>LogTarget=</varname></term>
- <term><varname>LogColor=</varname></term>
- <term><varname>LogLocation=</varname></term>
- <term><varname>DumpCore=yes</varname></term>
- <term><varname>CrashShell=no</varname></term>
- <term><varname>ShowStatus=yes</varname></term>
- <term><varname>CrashChVT=1</varname></term>
- <term><varname>DefaultStandardOutput=journal</varname></term>
- <term><varname>DefaultStandardError=inherit</varname></term>
-
- <listitem><para>Configures various
- parameters of basic manager
- operation. These options may be
- overridden by the respective command
- line arguments. See
- <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>
- for details about these command line
- arguments.</para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term><varname>CPUAffinity=</varname></term>
-
- <listitem><para>Configures the initial
- CPU affinity for the init
- process. Takes a space-separated list
- of CPU indexes.</para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term><varname>DefaultControllers=cpu</varname></term>
-
- <listitem><para>Configures in which
- cgroup controller hierarchies to
- create per-service cgroups
- automatically, in addition to the
- name=systemd named hierarchy. Defaults
- to 'cpu'. Takes a space separated list
- of controller names. Pass an empty
- string to ensure that systemd does not
- touch any hierarchies but its
- own.</para>
-
- <para>Note that the default value of
- 'cpu' will make realtime scheduling
- unavailable to system services. See
- <ulink
- url="http://www.freedesktop.org/wiki/Software/systemd/MyServiceCantGetRealtime">My
- Service Can't Get Realtime!</ulink>
- for more
- information.</para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term><varname>JoinControllers=cpu,cpuacct,cpuset net_cls,netprio</varname></term>
-
- <listitem><para>Configures controllers
- that shall be mounted in a single
- hierarchy. By default systemd will
- mount all controllers which are
- enabled in the kernel in individual
- hierarchies, with the exception of
- those listed in this setting. Takes a
- space separated list of comma
- separated controller names, in order
- to allow multiple joined
- hierarchies. Defaults to
- 'cpu,cpuacct'. Pass an empty string to
- ensure that systemd mounts all
- controllers in separate
- hierarchies.</para>
-
- <para>Note that this option is only
- applied once, at very early boot. If
- you use an initial RAM disk (initrd)
- that uses systemd it might hence be
- necessary to rebuild the initrd if
- this option is changed, and make sure
- the new configuration file is included
- in it. Otherwise the initrd might
- mount the controller hierachies in a
- different configuration than intended,
- and the main system cannot remount
- them anymore.</para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term><varname>RuntimeWatchdogSec=</varname></term>
- <term><varname>ShutdownWatchdogSec=</varname></term>
-
- <listitem><para>Configure the hardware
- watchdog at runtime and at
- reboot. Takes a timeout value in
- seconds (or in other time units if
- suffixed with <literal>ms</literal>,
- <literal>min</literal>,
- <literal>h</literal>,
- <literal>d</literal>,
- <literal>w</literal>). If
- <varname>RuntimeWatchdogSec=</varname>
- is set to a non-zero value the
- watchdog hardware
- (<filename>/dev/watchdog</filename>)
- will be programmed to automatically
- reboot the system if it is not
- contacted within the specified timeout
- interval. The system manager will
- ensure to contact it at least once in
- half the specified timeout
- interval. This feature requires a
- hardware watchdog device to be
- present, as it is commonly the case in
- embedded and server systems. Not all
- hardware watchdogs allow configuration
- of the reboot timeout, in which case
- the closest available timeout is
- picked. <varname>ShutdownWatchdogSec=</varname>
- may be used to configure the hardware
- watchdog when the system is asked to
- reboot. It works as a safety net to
- ensure that the reboot takes place
- even if a clean reboot attempt times
- out. By default
- <varname>RuntimeWatchdogSec=</varname>
- defaults to 0 (off), and
- <varname>ShutdownWatchdogSec=</varname>
- to 10min. These settings have no
- effect if a hardware watchdog is not
- available.</para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term><varname>CapabilityBoundingSet=</varname></term>
-
- <listitem><para>Controls which
- capabilities to include in the
- capability bounding set for PID 1 and
- its children. See
- <citerefentry><refentrytitle>capabilities</refentrytitle><manvolnum>7</manvolnum></citerefentry>
- for details. Takes a whitespace
- separated list of capability names as
- read by
- <citerefentry><refentrytitle>cap_from_name</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
- Capabilities listed will be included
- in the bounding set, all others are
- removed. If the list of capabilities
- is prefixed with ~ all but the listed
- capabilities will be included, the
- effect of the assignment
- inverted. Note that this option also
- affects the respective capabilities in
- the effective, permitted and
- inheritable capability sets. The
- capability bounding set may also be
- individually configured for units
- using the
- <varname>CapabilityBoundingSet=</varname>
- directive for units, but note that
- capabilities dropped for PID 1 cannot
- be regained in individual units, they
- are lost for good.</para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term><varname>TimerSlackNSec=</varname></term>
-
- <listitem><para>Sets the timer slack
- in nanoseconds for PID 1 which is then
- inherited to all executed processes,
- unless overridden individually, for
- example with the
- <varname>TimerSlackNSec=</varname>
- setting in service units (for details
- see
- <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>). The
- timer slack controls the accuracy of
- wake-ups triggered by timers. See
- <citerefentry><refentrytitle>prctl</refentrytitle><manvolnum>2</manvolnum></citerefentry>
- for more information. Note that in
- contrast to most other time span
- definitions this parameter takes an
- integer value in nano-seconds if no
- unit is specified. The usual time
- units are understood
- too.</para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term><varname>DefaultLimitCPU=</varname></term>
- <term><varname>DefaultLimitFSIZE=</varname></term>
- <term><varname>DefaultLimitDATA=</varname></term>
- <term><varname>DefaultLimitSTACK=</varname></term>
- <term><varname>DefaultLimitCORE=</varname></term>
- <term><varname>DefaultLimitRSS=</varname></term>
- <term><varname>DefaultLimitNOFILE=</varname></term>
- <term><varname>DefaultLimitAS=</varname></term>
- <term><varname>DefaultLimitNPROC=</varname></term>
- <term><varname>DefaultLimitMEMLOCK=</varname></term>
- <term><varname>DefaultLimitLOCKS=</varname></term>
- <term><varname>DefaultLimitSIGPENDING=</varname></term>
- <term><varname>DefaultLimitMSGQUEUE=</varname></term>
- <term><varname>DefaultLimitNICE=</varname></term>
- <term><varname>DefaultLimitRTPRIO=</varname></term>
- <term><varname>DefaultLimitRTTIME=</varname></term>
-
- <listitem><para>These settings control
- various default resource limits for
- units. See
- <citerefentry><refentrytitle>setrlimit</refentrytitle><manvolnum>2</manvolnum></citerefentry>
- for details. Use the string
- <varname>infinity</varname> to
- configure no limit on a specific
- resource. These settings may be
- overridden in individual units
- using the corresponding LimitXXX=
- directives. Note that these resource
- limits are only defaults for units,
- they are not applied to PID 1
- itself.</para></listitem>
- </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1>
- <title>See Also</title>
- <para>
- <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
- <citerefentry><refentrytitle>systemd.directives</refentrytitle><manvolnum>7</manvolnum></citerefentry>
- </para>
- </refsect1>
-
-</refentry>
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index 53094e5..952bb95 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -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
diff --git a/man/systemd.xml b/man/systemd.xml
index 5380ae8..cd38c16 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -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>,
diff --git a/src/core/system.conf b/src/core/system.conf
index 68076d9..508e0f5 100644
--- a/src/core/system.conf
+++ b/src/core/system.conf
@@ -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
diff --git a/src/core/user.conf b/src/core/user.conf
index e02b46b..4252451 100644
--- a/src/core/user.conf
+++ b/src/core/user.conf
@@ -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
diff --git a/src/shared/env-util.c b/src/shared/env-util.c
index 0f1ac92..54988e6 100644
--- a/src/shared/env-util.c
+++ b/src/shared/env-util.c
@@ -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;
More information about the systemd-commits
mailing list