chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: Support system.conf.d and user.conf.d directories in the usual search paths
[elogind.git]
/
src
/
core
/
system.conf
diff --git
a/src/core/system.conf
b/src/core/system.conf
index 5a723bb20e53e65a04e9f02929eed64f9e124b33..a3727200dfaf33ac93181db62cb23c8fbb3d4944 100644
(file)
--- a/
src/core/system.conf
+++ b/
src/core/system.conf
@@
-5,6
+5,9
@@
# the Free Software Foundation; either version 2.1 of the License, or
# (at your option) any later version.
#
# the Free Software Foundation; either version 2.1 of the License, or
# (at your option) any later version.
#
+# You can override the directives in this file by creating files in
+# /etc/systemd/system.conf.d/*.conf.
+#
# See systemd-system.conf(5) for details
[Manager]
# See systemd-system.conf(5) for details
[Manager]
@@
-23,9
+26,6
@@
#CapabilityBoundingSet=
#SystemCallArchitectures=
#TimerSlackNSec=
#CapabilityBoundingSet=
#SystemCallArchitectures=
#TimerSlackNSec=
-#StartTimeoutSec=15min
-#StartTimeoutAction=poweroff-force
-#StartTimeoutRebootArgument=
#DefaultTimerAccuracySec=1min
#DefaultStandardOutput=journal
#DefaultStandardError=inherit
#DefaultTimerAccuracySec=1min
#DefaultStandardOutput=journal
#DefaultStandardError=inherit