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=d8bfd1279d1db5c58c3c380837e04bfbba34a95b;hb=848e3e24b00a61130f20226ef5f051433d478c69;hpb=ab06eef8101866dd1337c4759002f7360a9db416 diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml index d8bfd1279..a7dfc0329 100644 --- a/man/systemd-system.conf.xml +++ b/man/systemd-system.conf.xml @@ -61,7 +61,6 @@ otherwise user.conf. These configuration files contain a few settings controlling basic manager operations. - @@ -100,46 +99,21 @@ Configures the initial CPU affinity for the init process. Takes a space-separated list - of CPU indexes. - - - - 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. + of CPU indices. - 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 +124,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 +149,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 +188,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 @@ -238,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= @@ -262,6 +279,83 @@ 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= + + 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. + + + + 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= @@ -302,7 +396,11 @@ See Also systemd1, - systemd.directives7 + systemd.directives7, + systemd.exec5, + systemd.service5, + environ7, + capabilities7