From 5f9cfd4c3877fdc68618faf9ae5efb5948e002b6 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Mon, 11 Feb 2013 14:42:24 -0500 Subject: man: rename systemd.conf to systemd-system.conf Alias as systemd-user.conf is also provided. This should help users running systemd in session mode. https://bugzilla.redhat.com/show_bug.cgi?id=690868 --- Makefile-man.am | 8 +- man/journald.conf.xml | 2 +- man/logind.conf.xml | 2 +- man/systemd-cgtop.xml | 2 +- man/systemd-system.conf.xml | 308 ++++++++++++++++++++++++++++++++++++++++++++ man/systemd.conf.xml | 307 ------------------------------------------- man/systemd.exec.xml | 6 +- man/systemd.xml | 4 +- src/core/system.conf | 2 +- src/core/user.conf | 2 +- src/shared/env-util.c | 2 +- 11 files changed, 324 insertions(+), 321 deletions(-) create mode 100644 man/systemd-system.conf.xml delete mode 100644 man/systemd.conf.xml diff --git a/Makefile-man.am b/Makefile-man.am index ee9a952765..e4eb26ce6e 100644 --- a/Makefile-man.am +++ b/Makefile-man.am @@ -1,5 +1,5 @@ # Do not edit. Generated by make-man-rules.py. -# Regenerate with 'make man-list-update'. +# Regenerate with 'make update-man-list'. MANPAGES += \ man/bootup.7 \ @@ -67,13 +67,13 @@ MANPAGES += \ man/systemd-suspend.service.8 \ man/systemd-sysctl.service.8 \ man/systemd-system-update-generator.8 \ + man/systemd-system.conf.5 \ man/systemd-tmpfiles.8 \ man/systemd-tty-ask-password-agent.1 \ man/systemd-udevd.service.8 \ man/systemd-update-utmp-runlevel.service.8 \ man/systemd.1 \ man/systemd.automount.5 \ - man/systemd.conf.5 \ man/systemd.device.5 \ man/systemd.exec.5 \ man/systemd.journal-fields.7 \ @@ -187,7 +187,8 @@ MANPAGES_ALIAS += \ man/systemd-udevd-kernel.socket.8 \ man/systemd-udevd.8 \ man/systemd-update-utmp-shutdown.service.8 \ - man/systemd-update-utmp.8 + man/systemd-update-utmp.8 \ + man/systemd-user.conf.5 man/SD_ALERT.3: man/sd-daemon.3 man/SD_CRIT.3: man/sd-daemon.3 man/SD_DEBUG.3: man/sd-daemon.3 @@ -281,6 +282,7 @@ man/systemd-udevd-kernel.socket.8: man/systemd-udevd.service.8 man/systemd-udevd.8: man/systemd-udevd.service.8 man/systemd-update-utmp-shutdown.service.8: man/systemd-update-utmp-runlevel.service.8 man/systemd-update-utmp.8: man/systemd-update-utmp-runlevel.service.8 +man/systemd-user.conf.5: man/systemd-system.conf.5 if ENABLE_BINFMT MANPAGES += \ diff --git a/man/journald.conf.xml b/man/journald.conf.xml index 30523c5370..6ba583b31d 100644 --- a/man/journald.conf.xml +++ b/man/journald.conf.xml @@ -404,7 +404,7 @@ systemd-journald.service8, journalctl1, systemd.journal-fields7, - systemd.conf5 + systemd-system.conf5 diff --git a/man/logind.conf.xml b/man/logind.conf.xml index d223514e0e..96e5936e5e 100644 --- a/man/logind.conf.xml +++ b/man/logind.conf.xml @@ -329,7 +329,7 @@ systemd1, systemd-logind.service8, loginctl1, - systemd.conf5 + systemd-system.conf5 diff --git a/man/systemd-cgtop.xml b/man/systemd-cgtop.xml index 7a34512b21..ad1f0f8c4d 100644 --- a/man/systemd-cgtop.xml +++ b/man/systemd-cgtop.xml @@ -78,7 +78,7 @@ blkio and memory to the DefaultControllers= setting in /etc/systemd/system.conf (see - systemd.conf5 + systemd-system.conf5 for details). Alternatively, it is possible to enable resource accounting individually for services, by making use of the ControlGroup= diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml new file mode 100644 index 0000000000..12979d81b6 --- /dev/null +++ b/man/systemd-system.conf.xml @@ -0,0 +1,308 @@ + + + + + + + + + systemd-system.conf + systemd + + + + Developer + Lennart + Poettering + lennart@poettering.net + + + + + + systemd-system.conf + 5 + + + + systemd-system.conf + systemd-user.conf + System and session service manager configuration file + + + + /etc/systemd/system.conf + /etc/systemd/user.conf + + + + Description + + When run as system instance systemd reads the + configuration file system.conf, + otherwise user.conf. These + configuration files contain a few settings controlling + basic manager operations. + + + + + Options + + All options are configured in the + [Manager] section: + + + + + LogLevel= + LogTarget= + LogColor= + LogLocation= + DumpCore=yes + CrashShell=no + ShowStatus=yes + CrashChVT=1 + DefaultStandardOutput=journal + DefaultStandardError=inherit + + Configures various + parameters of basic manager + operation. These options may be + overridden by the respective command + line arguments. See + systemd1 + for details about these command line + arguments. + + + + CPUAffinity= + + Configures the initial + CPU affinity for the init + process. Takes a space-separated list + of CPU indexes. + + + + DefaultControllers=cpu + + Configures in which + cgroup controller 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 an 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 + + Configures controllers + that shall be mounted in a single + 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 + to allow multiple joined + hierarchies. Defaults to + 'cpu,cpuacct'. Pass an empty string to + ensure that systemd mounts all + controllers in separate + hierarchies. + + 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 + 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 + different configuration than intended, + and the main system cannot remount + them anymore. + + + + RuntimeWatchdogSec= + ShutdownWatchdogSec= + + Configure the hardware + watchdog at runtime and at + reboot. Takes a timeout value in + seconds (or in other time units if + suffixed with ms, + min, + h, + d, + w). If + RuntimeWatchdogSec= + is set to a non-zero value the + watchdog hardware + (/dev/watchdog) + will be programmed to automatically + reboot the system if it is not + contacted within the specified timeout + interval. The system manager will + ensure to contact it at least once in + half the specified timeout + interval. This feature requires a + hardware watchdog device to be + present, as it is commonly the case in + embedded and server systems. Not all + hardware watchdogs allow configuration + of the reboot timeout, in which case + the closest available timeout is + picked. ShutdownWatchdogSec= + may be used to configure the hardware + watchdog when the system is asked to + reboot. It works as a safety net to + ensure that the reboot takes place + even if a clean reboot attempt times + out. By default + RuntimeWatchdogSec= + defaults to 0 (off), and + ShutdownWatchdogSec= + to 10min. These settings have no + effect if a hardware watchdog is not + available. + + + + CapabilityBoundingSet= + + Controls which + capabilities to include in the + capability bounding set for PID 1 and + its children. See + capabilities7 + 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 + capabilities will be included, the + effect of the assignment + inverted. Note that this option also + affects the respective capabilities in + the effective, permitted and + inheritable capability sets. The + capability bounding set may also be + individually configured for units + using the + CapabilityBoundingSet= + directive for units, but note that + capabilities dropped for PID 1 cannot + be regained in individual units, they + are lost for good. + + + + TimerSlackNSec= + + Sets the timer slack + in nanoseconds for PID 1 which is then + inherited to all executed processes, + unless overridden individually, for + example with the + TimerSlackNSec= + setting in service units (for details + see + systemd.exec5). The + timer slack controls the accuracy of + wake-ups triggered by timers. See + prctl2 + for more information. Note that in + contrast to most other time span + definitions this parameter takes an + integer value in nano-seconds if no + unit is specified. The usual time + units are understood + too. + + + + DefaultLimitCPU= + DefaultLimitFSIZE= + DefaultLimitDATA= + DefaultLimitSTACK= + DefaultLimitCORE= + DefaultLimitRSS= + DefaultLimitNOFILE= + DefaultLimitAS= + DefaultLimitNPROC= + DefaultLimitMEMLOCK= + DefaultLimitLOCKS= + DefaultLimitSIGPENDING= + DefaultLimitMSGQUEUE= + DefaultLimitNICE= + DefaultLimitRTPRIO= + DefaultLimitRTTIME= + + These settings control + various default resource limits for + units. See + setrlimit2 + for details. Use the string + infinity to + configure no limit on a specific + resource. These settings may be + overridden in individual units + using the corresponding LimitXXX= + directives. Note that these resource + limits are only defaults for units, + they are not applied to PID 1 + itself. + + + + + + See Also + + systemd1, + systemd.directives7 + + + + diff --git a/man/systemd.conf.xml b/man/systemd.conf.xml deleted file mode 100644 index 8c8fb7d7c0..0000000000 --- a/man/systemd.conf.xml +++ /dev/null @@ -1,307 +0,0 @@ - - - - - - - - - systemd.conf - systemd - - - - Developer - Lennart - Poettering - lennart@poettering.net - - - - - - systemd.conf - 5 - - - - systemd.conf - System and service manager configuration file - - - - /etc/systemd/system.conf - /etc/systemd/user.conf - - - - Description - - When run as system instance systemd reads the - configuration file system.conf, - otherwise user.conf. These - configuration files contain a few settings controlling - basic manager operations. - - - - - Options - - All options are configured in the - [Manager] section: - - - - - LogLevel= - LogTarget= - LogColor= - LogLocation= - DumpCore=yes - CrashShell=no - ShowStatus=yes - CrashChVT=1 - DefaultStandardOutput=journal - DefaultStandardError=inherit - - Configures various - parameters of basic manager - operation. These options may be - overridden by the respective command - line arguments. See - systemd1 - for details about these command line - arguments. - - - - CPUAffinity= - - Configures the initial - CPU affinity for the init - process. Takes a space-separated list - of CPU indexes. - - - - DefaultControllers=cpu - - Configures in which - cgroup controller 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 an 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 - - Configures controllers - that shall be mounted in a single - 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 - to allow multiple joined - hierarchies. Defaults to - 'cpu,cpuacct'. Pass an empty string to - ensure that systemd mounts all - controllers in separate - hierarchies. - - 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 - 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 - different configuration than intended, - and the main system cannot remount - them anymore. - - - - RuntimeWatchdogSec= - ShutdownWatchdogSec= - - Configure the hardware - watchdog at runtime and at - reboot. Takes a timeout value in - seconds (or in other time units if - suffixed with ms, - min, - h, - d, - w). If - RuntimeWatchdogSec= - is set to a non-zero value the - watchdog hardware - (/dev/watchdog) - will be programmed to automatically - reboot the system if it is not - contacted within the specified timeout - interval. The system manager will - ensure to contact it at least once in - half the specified timeout - interval. This feature requires a - hardware watchdog device to be - present, as it is commonly the case in - embedded and server systems. Not all - hardware watchdogs allow configuration - of the reboot timeout, in which case - the closest available timeout is - picked. ShutdownWatchdogSec= - may be used to configure the hardware - watchdog when the system is asked to - reboot. It works as a safety net to - ensure that the reboot takes place - even if a clean reboot attempt times - out. By default - RuntimeWatchdogSec= - defaults to 0 (off), and - ShutdownWatchdogSec= - to 10min. These settings have no - effect if a hardware watchdog is not - available. - - - - CapabilityBoundingSet= - - Controls which - capabilities to include in the - capability bounding set for PID 1 and - its children. See - capabilities7 - 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 - capabilities will be included, the - effect of the assignment - inverted. Note that this option also - affects the respective capabilities in - the effective, permitted and - inheritable capability sets. The - capability bounding set may also be - individually configured for units - using the - CapabilityBoundingSet= - directive for units, but note that - capabilities dropped for PID 1 cannot - be regained in individual units, they - are lost for good. - - - - TimerSlackNSec= - - Sets the timer slack - in nanoseconds for PID 1 which is then - inherited to all executed processes, - unless overridden individually, for - example with the - TimerSlackNSec= - setting in service units (for details - see - systemd.exec5). The - timer slack controls the accuracy of - wake-ups triggered by timers. See - prctl2 - for more information. Note that in - contrast to most other time span - definitions this parameter takes an - integer value in nano-seconds if no - unit is specified. The usual time - units are understood - too. - - - - DefaultLimitCPU= - DefaultLimitFSIZE= - DefaultLimitDATA= - DefaultLimitSTACK= - DefaultLimitCORE= - DefaultLimitRSS= - DefaultLimitNOFILE= - DefaultLimitAS= - DefaultLimitNPROC= - DefaultLimitMEMLOCK= - DefaultLimitLOCKS= - DefaultLimitSIGPENDING= - DefaultLimitMSGQUEUE= - DefaultLimitNICE= - DefaultLimitRTPRIO= - DefaultLimitRTTIME= - - These settings control - various default resource limits for - units. See - setrlimit2 - for details. Use the string - infinity to - configure no limit on a specific - resource. These settings may be - overridden in individual units - using the corresponding LimitXXX= - directives. Note that these resource - limits are only defaults for units, - they are not applied to PID 1 - itself. - - - - - - See Also - - systemd1, - systemd.directives7 - - - - diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml index 53094e587d..952bb9595e 100644 --- a/man/systemd.exec.xml +++ b/man/systemd.exec.xml @@ -462,7 +462,7 @@ with in - systemd.conf5, + systemd-system.conf5, which defaults to . @@ -481,7 +481,7 @@ setting defaults to the value set with in - systemd.conf5, + systemd-system.conf5, which defaults to . @@ -839,7 +839,7 @@ settings of DefaultControllers= of - systemd.conf5, + systemd-system.conf5, but a unit's ControlGroup= setting for a specific controller diff --git a/man/systemd.xml b/man/systemd.xml index 5380ae8b67..cd38c16375 100644 --- a/man/systemd.xml +++ b/man/systemd.xml @@ -78,7 +78,7 @@ the configuration file system.conf, otherwise user.conf. See - systemd.conf5 + systemd-system.conf5 for more information. @@ -1258,7 +1258,7 @@ See Also - systemd.conf5, + systemd-system.conf5, locale.conf5, systemctl1, journalctl1, diff --git a/src/core/system.conf b/src/core/system.conf index 68076d9735..508e0f5fa4 100644 --- a/src/core/system.conf +++ b/src/core/system.conf @@ -5,7 +5,7 @@ # the Free Software Foundation; either version 2.1 of the License, or # (at your option) any later version. # -# See systemd.conf(5) for details +# See systemd-system.conf(5) for details [Manager] #LogLevel=info diff --git a/src/core/user.conf b/src/core/user.conf index e02b46bc3a..4252451eb7 100644 --- a/src/core/user.conf +++ b/src/core/user.conf @@ -5,7 +5,7 @@ # the Free Software Foundation; either version 2.1 of the License, or # (at your option) any later version. # -# See systemd.conf(5) for details +# See systemd-user.conf(5) for details [Manager] #LogLevel=info diff --git a/src/shared/env-util.c b/src/shared/env-util.c index 0f1ac9294b..54988e6437 100644 --- a/src/shared/env-util.c +++ b/src/shared/env-util.c @@ -108,7 +108,7 @@ bool env_assignment_is_valid(const char *e) { /* POSIX says the overall size of the environment block cannot * be > ARG_MAX, hence the individual variable assignments - * cannot be either, but let's room for one trailing NUL + * cannot be either, but let's leave room for one trailing NUL * byte. */ if (strlen(e) > ARG_MAX - 1) return false; -- cgit v1.2.3-54-g00ecf