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=fd898f75b9e60c7a95ab5ef2258d467e9e674038;hp=eaa770b4b1ef0fdc1b03ee7a1a5938d0c2b67553;hb=3f41e1e5955552a771748225334b3e8a7eb02b8a;hpb=37d3ab1b7e114f0fb6dfb2e7273569b42794b76a diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml index eaa770b4b..fd898f75b 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. - @@ -94,6 +93,42 @@ 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= @@ -104,42 +139,17 @@ - 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. - - - - 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,12 +160,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 +185,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 +224,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 +271,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 +333,8 @@ See Also systemd1, - systemd.directives7 + systemd.directives7, + environ7