X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd-system.conf.xml;h=a7dfc0329c6891e62875cf56521d9eb315a39924;hp=fd898f75b9e60c7a95ab5ef2258d467e9e674038;hb=22fdeadcc06e95fe41ac4de872ec245c0887547f;hpb=3f41e1e5955552a771748225334b3e8a7eb02b8a
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index fd898f75b..a7dfc0329 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -93,49 +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
- 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).
-
-
-
CPUAffinity=
Configures the initial
CPU affinity for the init
process. Takes a space-separated list
- of CPU indexes.
+ of CPU indices.
@@ -247,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=
@@ -271,6 +279,44 @@
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
+ services, 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
+ unit start rate limiting, as
+ configured per-service by
+ StartLimitInterval=
+ and
+ StartLimitBurst=. See
+ systemd.service5
+ for details on the per-service
+ settings.
+
+
DefaultEnvironment=
@@ -293,6 +339,23 @@
VAR3.
+
+ DefaultCPUAccounting=
+ DefaultBlockIOAccounting=
+ DefaultMemoryAccounting=
+
+ Configure the default
+ resource accounting settings, as
+ configured per-unit by
+ CPUAccounting=,
+ BlockIOAccounting=
+ and
+ MemoryAccounting=. See
+ systemd.resource-control5
+ for details on the per-unit
+ settings.
+
+
DefaultLimitCPU=
DefaultLimitFSIZE=
@@ -334,7 +397,10 @@
systemd1,
systemd.directives7,
- environ7
+ systemd.exec5,
+ systemd.service5,
+ environ7,
+ capabilities7