X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd-system.conf.xml;h=e8cf8a9cb24f60636068167284bdbce0c399cb38;hb=4b4bec19582c3ad2b7d25116f3c22c783274fead;hp=d8bfd1279d1db5c58c3c380837e04bfbba34a95b;hpb=ab06eef8101866dd1337c4759002f7360a9db416;p=elogind.git
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index d8bfd1279..e8cf8a9cb 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -104,42 +104,17 @@
- DefaultControllers=cpu
-
- Configures in which
- control group 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 the empty string to ensure
- that systemd does not touch any
- hierarchies but its own.
-
- Note that the default value of
- 'cpu' will make realtime scheduling
- unavailable to system services. See
- My
- Service Can't Get Realtime!
- for more
- information.
-
-
-
- JoinControllers=cpu,cpuacct,cpuset net_cls,netprio
+ JoinControllers=cpu,cpuacct net_cls,netprio
Configures controllers
that shall be mounted in a single
- hierarchy. By default systemd will
+ 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
+ space-separated list of comma-separated
+ controller names, in order
to allow multiple joined
hierarchies. Defaults to
'cpu,cpuacct'. Pass an empty string to
@@ -150,11 +125,11 @@
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
+ 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
+ in it. Otherwise, the initrd might
mount the controller hierarchies in a
different configuration than intended,
and the main system cannot remount
@@ -175,7 +150,7 @@
d,
w). If
RuntimeWatchdogSec=
- is set to a non-zero value the
+ is set to a non-zero value, the
watchdog hardware
(/dev/watchdog)
will be programmed to automatically
@@ -214,14 +189,13 @@
capability bounding set for PID 1 and
its children. See
capabilities7
- for details. Takes a whitespace
- separated list of capability names as
- read by
+ 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
+ is prefixed with ~, all but the listed
capabilities will be included, the
effect of the assignment
inverted. Note that this option also
@@ -262,6 +236,28 @@
too.
+
+ DefaultEnvironment=
+
+ Sets manager
+ environment variables passed to all
+ executed processes. Takes a
+ space-separated list of variable
+ assignments. See
+ environ7
+ for details about environment
+ variables.
+
+ Example:
+
+ DefaultEnvironment="VAR1=word1 word2" VAR2=word3 "VAR3=word 5 6"
+
+ Sets three variables
+ VAR1,
+ VAR2,
+ VAR3.
+
+
DefaultLimitCPU=
DefaultLimitFSIZE=
@@ -302,7 +298,8 @@
See Also
systemd1,
- systemd.directives7
+ systemd.directives7,
+ environ7