X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=man%2Fsystemd.conf.xml;h=7dfaa18c184f632412f3c641f9714997ea3ff1e3;hb=c93ff2e913a6da516c83c0d3f8df73004acc6c8b;hp=c7890287b5c7a914852c402cdeb612bb7dfe2bbc;hpb=e96d6be763014be75d480fde503d0b77f41194a0;p=elogind.git
diff --git a/man/systemd.conf.xml b/man/systemd.conf.xml
index c7890287b..7dfaa18c1 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 .
-->
@@ -103,18 +103,6 @@
of CPU indexes.
-
- MountAuto=yes
- SwapAuto=yes
-
- Configures whether
- systemd should automatically activate
- all swap or mounts listed in
- /etc/fstab, or
- whether this job is left to some other
- system script.
-
-
DefaultControllers=cpu
@@ -194,6 +182,33 @@
effect if a hardware watchdog is not
available.
+
+
+ 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. They can be overriden in units files
+ using corresponding LimitXXXX parameter.
+