X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.conf.xml;h=a550c2c71aacc0ef86dd2ee6c64564efb9da187b;hb=a6e87e90ede66815989ba2db92a07102a69906fe;hp=c7890287b5c7a914852c402cdeb612bb7dfe2bbc;hpb=e96d6be763014be75d480fde503d0b77f41194a0;p=elogind.git
diff --git a/man/systemd.conf.xml b/man/systemd.conf.xml
index c7890287b..a550c2c71 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
@@ -79,7 +79,6 @@
DumpCore=yes
CrashShell=no
ShowStatus=yes
- SysVConsole=yes
CrashChVT=1
DefaultStandardOutput=journal
DefaultStandardError=inherit
@@ -103,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
@@ -131,14 +118,14 @@
- JoinControllers=cpu,cpuacct
+ 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
- hierachies, with the exception of
+ hierarchies, with the exception of
those listed in this setting. Takes a
space separated list of comma
separated controller names, in order
@@ -194,6 +181,96 @@
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.
+