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=dfb180cc54c0dfb9649ca5ee38cdc605bcf6b468;hp=c52e59096ace7ec28f5668a8711ccef165fa1bd9;hb=85a8eeee36b57c1ab382b0225fa9a87525bbeee9;hpb=79640424059328268b9fb6c5fa8eb777b27a177e diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml index c52e59096..dfb180cc5 100644 --- a/man/systemd-system.conf.xml +++ b/man/systemd-system.conf.xml @@ -22,7 +22,8 @@ along with systemd; If not, see . --> - + systemd-system.conf systemd @@ -44,26 +45,39 @@ systemd-system.conf + system.conf.d systemd-user.conf - System and session service manager configuration file + user.conf.d + System and session service manager configuration files /etc/systemd/system.conf + /etc/systemd/system.conf.d/*.conf + /run/systemd/system.conf.d/*.conf + /usr/lib/systemd/system.conf.d/*.conf /etc/systemd/user.conf + /etc/systemd/user.conf.d/*.conf + /run/systemd/user.conf.d/*.conf + /usr/lib/systemd/user.conf.d/*.conf Description - When run as system instance systemd reads the - configuration file system.conf, - otherwise user.conf. These + When run as a system instance, systemd interprets the + configuration file system.conf and the + files in system.conf.d directories; when + run as a user instance, systemd interprets the configuration + file user.conf and the files in + user.conf.d directories. These configuration files contain a few settings controlling basic manager operations. - + + + Options @@ -100,36 +114,11 @@ 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 @@ -213,7 +202,7 @@ capabilities to include in the capability bounding set for PID 1 and its children. See - capabilities7 + capabilities7 for details. Takes a whitespace-separated list of capability names as read by cap_from_name3. @@ -237,12 +226,55 @@ 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= Sets the timer slack - in nanoseconds for PID 1 which is then - inherited to all executed processes, + in nanoseconds for PID 1, which is + inherited by all executed processes, unless overridden individually, for example with the TimerSlackNSec= @@ -250,7 +282,8 @@ see systemd.exec5). The timer slack controls the accuracy of - wake-ups triggered by timers. See + wake-ups triggered by system + timers. See prctl2 for more information. Note that in contrast to most other time span @@ -261,6 +294,65 @@ too. + + DefaultTimerAccuracySec= + + Sets the default + accuracy of timer units. This controls + the global default for the + AccuracySec= + setting of timer units, see + systemd.timer5 + for + details. AccuracySec= + set in individual units override the + global default for the specific + unit. Defaults to 1min. Note that the + accuracy of timer units is also + affected by the configured timer slack + for PID 1, see + TimerSlackNSec= + above. + + + + 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= @@ -269,7 +361,7 @@ executed processes. Takes a space-separated list of variable assignments. See - environ7 + environ7 for details about environment variables. @@ -283,6 +375,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= @@ -324,7 +433,10 @@ systemd1, systemd.directives7, - environ7 + systemd.exec5, + systemd.service5, + environ7, + capabilities7