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=f3a89ad45903bee63a0efbbd2c7a4ddeb456a88f;hp=a67b158996c2fe85ffe3eb2aab12d02f5d5f8fe0;hb=8dc385e7701726be69b681e2738a1d74a21b24f1;hpb=e9dd9f9547350c7dc0473583b5c2228dc8f0ab76 diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml index a67b15899..f3a89ad45 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,40 +99,15 @@ 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 @@ -154,7 +128,7 @@ 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 @@ -220,7 +194,7 @@ 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 @@ -237,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= @@ -261,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= @@ -324,7 +378,10 @@ systemd1, systemd.directives7, - environ7 + systemd.exec5, + systemd.service5, + environ7, + capabilities7