X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fsystem.conf;h=83c1f46814dc8b002c8bced71ec7fb6d7ac627f5;hb=68fb08920b2162b48cf0fa8dd98b021327b42896;hp=c6a7bf3df8b129b8d44810b9aaeaa8fe7703b96a;hpb=173a8d04fc3535b571fe4a0d4715c18be315a43a;p=elogind.git

diff --git a/src/system.conf b/src/system.conf
index c6a7bf3df..83c1f4681 100644
--- a/src/system.conf
+++ b/src/system.conf
@@ -1,15 +1,15 @@
 #  This file is part of systemd.
 #
 #  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.
 #
-# See systemd(1) for details
+# See systemd.conf(5) for details
 
 [Manager]
 #LogLevel=info
-#LogTarget=syslog-or-kmsg
+#LogTarget=journal-or-kmsg
 #LogColor=yes
 #LogLocation=no
 #DumpCore=yes
@@ -20,3 +20,9 @@
 #CPUAffinity=1 2
 #MountAuto=yes
 #SwapAuto=yes
+#DefaultControllers=cpu
+#DefaultStandardOutput=journal
+#DefaultStandardError=inherit
+#JoinControllers=cpu,cpuacct
+#RuntimeWatchdog=0
+#ShutdownWatchdog=10min