X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.conf.xml;h=d05a30bd48e41b254a3c74b9fb6b824dcc398d57;hb=3d9a412243035beeaaf3465a62065444a5adf21c;hp=54a8398d43f6a98985a83e3a3eac31f104ffa616;hpb=5471472d441d9ac48640f11a3b07e6a1fd6d1b63;p=elogind.git
diff --git a/man/systemd.conf.xml b/man/systemd.conf.xml
index 54a8398d4..d05a30bd4 100644
--- a/man/systemd.conf.xml
+++ b/man/systemd.conf.xml
@@ -9,16 +9,16 @@
Copyright 2010 Lennart Poettering
systemd is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
systemd is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
+ You should have received a copy of the GNU Lesser General Public License
along with systemd; If not, see .
-->
@@ -81,6 +81,8 @@
ShowStatus=yes
SysVConsole=yes
CrashChVT=1
+ DefaultStandardOutput=journal
+ DefaultStandardError=inherit
Configures various
parameters of basic manager
@@ -127,6 +129,71 @@
touch any hierarchies but its
own.
+
+
+ JoinControllers=cpu,cpuacct
+
+ 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
+ hierachies, 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.
+
+
+
+ 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.
+