X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd.conf.xml;h=7776c8f4f739808e13b17173eb9855a7628f0d02;hp=54a8398d43f6a98985a83e3a3eac31f104ffa616;hb=f89a3b6f5bf695186e7b9e6cc63993b1272e7569;hpb=5471472d441d9ac48640f11a3b07e6a1fd6d1b63
diff --git a/man/systemd.conf.xml b/man/systemd.conf.xml
index 54a8398d4..7776c8f4f 100644
--- a/man/systemd.conf.xml
+++ b/man/systemd.conf.xml
@@ -9,16 +9,16 @@
Copyright 2010 Lennart Poettering
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
+ 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
- General Public License for more details.
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
+ You should have received a copy of the GNU Lesser General Public License
along with systemd; If not, see .
-->
@@ -44,12 +44,12 @@
systemd.conf
- systemd manager configuration file
+ System and service manager configuration file
- system.conf
- user.conf
+ /etc/systemd/system.conf
+ /etc/systemd/user.conf
@@ -69,7 +69,7 @@
All options are configured in the
[Manager] section:
-
+
LogLevel=
@@ -79,8 +79,9 @@
DumpCore=yes
CrashShell=no
ShowStatus=yes
- SysVConsole=yes
CrashChVT=1
+ DefaultStandardOutput=journal
+ DefaultStandardError=inherit
Configures various
parameters of basic manager
@@ -101,18 +102,6 @@
of CPU indexes.
-
- MountAuto=yes
- SwapAuto=yes
-
- Configures whether
- systemd should automatically activate
- all swap or mounts listed in
- /etc/fstab, or
- whether this job is left to some other
- system script.
-
-
DefaultControllers=cpu
@@ -127,6 +116,161 @@
touch any hierarchies but its
own.
+
+
+ JoinControllers=cpu,cpuacct,cpuset net_cls,netprio
+
+ 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.
+
+
+
+ RuntimeWatchdogSec=
+ ShutdownWatchdogSec=
+
+ Configure the hardware
+ watchdog at runtime and at
+ reboot. Takes a timeout value in
+ seconds (or in other time units if
+ suffixed with ms,
+ min,
+ h,
+ d,
+ w). If
+ RuntimeWatchdogSec=
+ is set to a non-zero value the
+ watchdog hardware
+ (/dev/watchdog)
+ 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. ShutdownWatchdogSec=
+ 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
+ RuntimeWatchdogSec=
+ defaults to 0 (off), and
+ ShutdownWatchdogSec=
+ to 10min. These settings have no
+ effect if a hardware watchdog is not
+ available.
+
+
+
+ CapabilityBoundingSet=
+
+ Controls which
+ capabilities to include in the
+ capability bounding set for PID 1 and
+ its children. See
+ capabilities7
+ for details. Takes a whitespace
+ separated list of capability names as
+ read by
+ cap_from_name3.
+ 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
+ effects the respective capabilities in
+ the effective, permitted and
+ inheritable capability sets. The
+ capability bounding set may also be
+ individually configured for units
+ using the
+ CapabilityBoundingSet=
+ directive for units, but note that
+ capabilities dropped for PID 1 cannot
+ be regained in individual units, they
+ are lost for good.
+
+
+
+ TimerSlackNSec=
+
+ Sets the timer slack
+ in nanoseconds for PID 1 which is then
+ inherited to all executed processes,
+ unless overriden individually, for
+ example with the
+ TimerSlackNSec=
+ setting in service units (for details
+ see
+ systemd.exec5). The
+ timer slack controls the accuracy of
+ wake-ups triggered by timers. See
+ prctl2
+ 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.
+
+
+
+ DefaultLimitCPU=
+ DefaultLimitFSIZE=
+ DefaultLimitDATA=
+ DefaultLimitSTACK=
+ DefaultLimitCORE=
+ DefaultLimitRSS=
+ DefaultLimitNOFILE=
+ DefaultLimitAS=
+ DefaultLimitNPROC=
+ DefaultLimitMEMLOCK=
+ DefaultLimitLOCKS=
+ DefaultLimitSIGPENDING=
+ DefaultLimitMSGQUEUE=
+ DefaultLimitNICE=
+ DefaultLimitRTPRIO=
+ DefaultLimitRTTIME=
+
+ These settings control
+ various default resource limits for
+ units. See
+ setrlimit2
+ for details. Use the string
+ infinity to
+ configure no limit on a specific
+ resource. These settings may be
+ overriden 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.
+