X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd-system.conf.xml;h=f3a89ad45903bee63a0efbbd2c7a4ddeb456a88f;hp=c1f26484eecc56fba42e44d1af4c63c0ea42362e;hb=96197df081a16bec192a6cfb8f19674ca58f4835;hpb=1f19a534ea84458670ec011f6d1ba96f76e3f783
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index c1f26484e..f3a89ad45 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -93,36 +93,13 @@
arguments.
-
- DefaultTimeoutStartSec=
- DefaultTimeoutStopSec=
- DefaultRestartSec=
-
- Configures the default
- time-outs for starting and stopping of
- units, as well as the default time to
- sleep between automatic restarts of a
- units, as configured per-unit in
- TimeoutStartSec=,
- TimeoutStopSec= and
- RestartSec= (for
- service units see
- systemd.service5
- for details on the per-unit
- settings). For non-service units
- DefaultTimeoutStartSec=
- sets the default
- TimeoutSec= value.
-
-
-
CPUAffinity=
Configures the initial
CPU affinity for the init
process. Takes a space-separated list
- of CPU indexes.
+ of CPU indices.
@@ -234,6 +211,50 @@
are lost for good.
+
+ SystemCallArchitectures=
+
+ Takes a
+ space-separated list of architecture
+ identifiers. Selects from which
+ architectures system calls may be
+ invoked on this system. This may be
+ used as an effective way to disable
+ invocation of non-native binaries
+ system-wide, for example to prohibit
+ execution of 32-bit x86 binaries on
+ 64-bit x86-64 systems. This option
+ operates system-wide, and acts
+ similar to the
+ SystemCallArchitectures=
+ setting of unit files, see
+ systemd.exec5
+ for details. This setting defaults to
+ the empty list, in which case no
+ filtering of system calls based on
+ architecture is applied. Known
+ architecture identifiers are
+ x86,
+ x86-64,
+ x32,
+ arm and the special
+ identifier
+ native. The latter
+ implicitly maps to the native
+ architecture of the system (or more
+ specifically, the architecture the
+ system manager was compiled for). Set
+ this setting to
+ native to prohibit
+ execution of any non-native
+ binaries. When a binary executes a
+ system call of an architecture that is
+ not listed in this setting, it will be
+ immediately terminated with the SIGSYS
+ signal.
+
+
+
TimerSlackNSec=
@@ -258,6 +279,42 @@
too.
+
+ DefaultTimeoutStartSec=
+ DefaultTimeoutStopSec=
+ DefaultRestartSec=
+
+ Configures the default
+ timeouts for starting and stopping of
+ units, as well as the default time to
+ sleep between automatic restarts of
+ units, as configured per-unit in
+ TimeoutStartSec=,
+ TimeoutStopSec= and
+ RestartSec= (for
+ service units, see
+ systemd.service5
+ for details on the per-unit
+ settings). For non-service units,
+ DefaultTimeoutStartSec=
+ sets the default
+ TimeoutSec= value.
+
+
+
+ DefaultStartLimitInterval=
+ DefaultStartLimitBurst=
+
+ Configure the default start rate
+ limiting, as configured per-service by
+ StartLimitInterval= and
+ StartLimitBurst=. See
+ systemd.service5
+ for details on the per-service
+ settings).
+
+
+
DefaultEnvironment=
@@ -321,7 +378,10 @@
systemd1,
systemd.directives7,
- environ7
+ systemd.exec5,
+ systemd.service5,
+ environ7,
+ capabilities7