X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd-system.conf.xml;h=c52e59096ace7ec28f5668a8711ccef165fa1bd9;hb=6e1452d6f015ebca6801e497d12bc6c7c114386d;hp=eaa770b4b1ef0fdc1b03ee7a1a5938d0c2b67553;hpb=37d3ab1b7e114f0fb6dfb2e7273569b42794b76a;p=elogind.git
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index eaa770b4b..c52e59096 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -112,8 +112,8 @@
addition to the
name=systemd named
hierarchy. Defaults to
- cpu. Takes a space
- separated list of controller
+ 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.
@@ -133,13 +133,13 @@
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,12 +150,12 @@
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
- mount the controller hierachies in a
+ in it. Otherwise, the initrd might
+ mount the controller hierarchies in a
different configuration than intended,
and the main system cannot remount
them anymore.
@@ -175,7 +175,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 +214,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 +261,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 +323,8 @@
See Also
systemd1,
- systemd.directives7
+ systemd.directives7,
+ environ7