diff --git a/Makefile.am b/Makefile.am
index cdb5be314e..0215f2325d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -341,7 +341,8 @@ MANPAGES = \
man/telinit.8 \
man/halt.8 \
man/shutdown.8 \
- man/pam_systemd.8
+ man/pam_systemd.8 \
+ man/systemd.conf.5
MANPAGES_ALIAS = \
man/reboot.8 \
diff --git a/man/sd-daemon.xml b/man/sd-daemon.xml
index d961513329..e3ac68eed3 100644
--- a/man/sd-daemon.xml
+++ b/man/sd-daemon.xml
@@ -61,7 +61,7 @@
sd-daemon.h provide a reference
implementation of various APIs for new-style daemons,
as implemented by the
- systemd8
+ systemd1
init system.
See
diff --git a/man/systemd.automount.xml b/man/systemd.automount.xml
index d1e04f6138..754d1e37f3 100644
--- a/man/systemd.automount.xml
+++ b/man/systemd.automount.xml
@@ -155,7 +155,7 @@
See Also
- systemd8,
+ systemd1,
systemctl8,
systemd.unit5,
systemd.mount5,
diff --git a/man/systemd.conf.xml b/man/systemd.conf.xml
new file mode 100644
index 0000000000..95a2e5261b
--- /dev/null
+++ b/man/systemd.conf.xml
@@ -0,0 +1,112 @@
+
+
+
+
+
+
+
+
+ systemd.conf
+ systemd
+
+
+
+ Developer
+ Lennart
+ Poettering
+ lennart@poettering.net
+
+
+
+
+
+ systemd.conf
+ 5
+
+
+
+ systemd.conf
+ systemd manager configuration file
+
+
+
+ system.conf
+ session.conf
+
+
+
+ Description
+
+ When run as system instance systemd reads the
+ configuration file system.conf,
+ otherwise session.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
+
+ Configures various
+ parameters of basic manager
+ operation. These options may be
+ overriden 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-seperated list
+ of CPU indexes.
+
+
+
+
+
+ See Also
+
+ systemd1
+
+
+
+
diff --git a/man/systemd.device.xml b/man/systemd.device.xml
index c5306430fb..ea1416fd73 100644
--- a/man/systemd.device.xml
+++ b/man/systemd.device.xml
@@ -139,7 +139,7 @@
See Also
- systemd8,
+ systemd1,
systemctl8,
systemd.unit5,
udev7
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index 6502d87b4a..68495dcaf7 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -734,7 +734,7 @@
See Also
- systemd8,
+ systemd1,
systemctl8,
systemd.unit5,
systemd.service5,
diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
index 45173b55fd..70170bb865 100644
--- a/man/systemd.mount.xml
+++ b/man/systemd.mount.xml
@@ -237,7 +237,7 @@
See Also
- systemd8,
+ systemd1,
systemctl8,
systemd.unit5,
systemd.exec5,
diff --git a/man/systemd.path.xml b/man/systemd.path.xml
index d910d2c5c8..d5495c7cc3 100644
--- a/man/systemd.path.xml
+++ b/man/systemd.path.xml
@@ -174,7 +174,7 @@
See Also
- systemd8,
+ systemd1,
systemctl8,
systemd.unit5,
systemd.service5,
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index 008ebd752e..bceb5aa110 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -538,7 +538,7 @@
See Also
- systemd8,
+ systemd1,
systemctl8,
systemd.unit5,
systemd.exec5
diff --git a/man/systemd.snapshot.xml b/man/systemd.snapshot.xml
index 5287ad2a56..a3e23225c6 100644
--- a/man/systemd.snapshot.xml
+++ b/man/systemd.snapshot.xml
@@ -78,7 +78,7 @@
See Also
- systemd8,
+ systemd1,
systemctl8,
systemd.unit5
diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
index 6154b304e8..32102fab88 100644
--- a/man/systemd.socket.xml
+++ b/man/systemd.socket.xml
@@ -509,7 +509,7 @@
See Also
- systemd8,
+ systemd1,
systemctl8,
systemd.unit5,
systemd.exec5,
diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml
index 18f96d008f..38574ab4c8 100644
--- a/man/systemd.swap.xml
+++ b/man/systemd.swap.xml
@@ -134,7 +134,7 @@
See Also
- systemd8,
+ systemd1,
systemctl8,
systemd.unit5,
systemd.device5,
diff --git a/man/systemd.target.xml b/man/systemd.target.xml
index 6f3bc182dc..5c26427596 100644
--- a/man/systemd.target.xml
+++ b/man/systemd.target.xml
@@ -97,7 +97,7 @@
See Also
- systemd8,
+ systemd1,
systemctl8,
systemd.unit5,
systemd.special7
diff --git a/man/systemd.timer.xml b/man/systemd.timer.xml
index 557a45e0fe..518ae2a9f1 100644
--- a/man/systemd.timer.xml
+++ b/man/systemd.timer.xml
@@ -182,7 +182,7 @@
See Also
- systemd8,
+ systemd1,
systemctl8,
systemd.unit5,
systemd.service5
diff --git a/man/systemd.xml b/man/systemd.xml
index b4a7e3ec93..ba775c5c91 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -73,6 +73,13 @@
are mostly equivalent when invoked from normal login sessions. See
telinit8
for more information.
+
+ When run as system instance, systemd interprets
+ the configuration file
+ system.conf, otherwise
+ session.conf. See
+ systemd.conf5
+ for more information.
@@ -88,6 +95,37 @@
Prints a short help
text and exits.
+
+
+
+ Determine startup
+ sequence, dump it and exit. This is an
+ option useful for debugging
+ only.
+
+
+
+
+ Dump understood unit
+ configuration items. This outputs a
+ terse but complete list of
+ configuration items understood in unit
+ definition files.
+
+
+
+
+ Extract D-Bus
+ interface introspection data. This is
+ mostly useful at build at install time
+ to generate data suitable for the
+ D-Bus interfaces
+ repository. Optionally the interface
+ name for the introspection data may be
+ specified. If omitted, the
+ introspection data for all interfaces
+ is dumped.
+
@@ -111,40 +149,35 @@
debugging.
-
+
- Determine startup
- sequence, dump it and exit. This is an
- option useful for debugging
- only.
+ Dump core on crash. This switch has no effect when run as session instance.
-
+
- Dump understood unit
- configuration items. This outputs a
- terse but complete list of
- configuration items understood in unit
- definition files.
+ Run shell on crash. This switch has no effect when run as session instance.
- Ask for confirmation when spawning processes.
+ Ask for confirmation when spawning processes. This switch has no effect when run as session instance.
-
+
- Extract D-Bus
- interface introspection data. This is
- mostly useful at build at install time
- to generate data suitable for the
- D-Bus interfaces
- repository. Optionally the interface
- name for the introspection data may be
- specified. If omitted, the
- introspection data for all interfaces
- is dumped.
+ Show terse service status information while booting. This switch has no effect when run as session instance.
+
+
+
+
+ Set log
+ target. Argument must be one of
+ ,
+ ,
+ ,
+ ,
+ .
@@ -162,17 +195,6 @@
,
.
-
-
-
- Set log
- target. Argument must be one of
- ,
- ,
- ,
- ,
- .
-
@@ -714,6 +736,87 @@
+
+ Kernel Command Line
+
+ When run as system instance systemd parses a few kernel command line arguments:
+
+
+
+ systemd.unit=
+
+ Overrides the unit to
+ activate on boot. Defaults to
+ default.target. This
+ may be used to temporarily boot into a
+ different boot unit, for example
+ rescue.target or
+ emergency.service. See
+ systemd.special7
+ for details about these
+ units.
+
+
+
+ systemd.log_target=
+ systemd.log_level=
+ systemd.log_color=
+ systemd.log_location=
+
+ Controls log output,
+ with the same effect as the
+ $SYSTEMD_LOG_TARGET, $SYSTEMD_LOG_LEVEL, $SYSTEMD_LOG_COLOR, $SYSTEMD_LOG_LOCATION
+ environment variables described above.
+
+
+
+ systemd.dump_core=
+
+ Takes a boolean
+ argument. If
+ systemd dumps core when it
+ crashes. Otherwise no core dump is
+ created. Defaults to
+ .
+
+
+
+ systemd.crash_shell=
+
+ Takes a boolean
+ argument. If
+ systemd spawns a shell when it
+ crashes. Otherwise no core dump is
+ created. Defaults to
+ , for security
+ reasons, as the shell is not protected
+ by any password
+ authentication.
+
+
+
+ systemd.crash_chvt=
+
+ Takes an integer
+ argument. If positive systemd
+ activates the specified virtual
+ terminal when it crashes. Defaults to
+ -1.
+
+
+
+ systemd.show_status=
+
+ Takes a boolean
+ argument. If
+ shows terse service status updates on
+ the console during bootup. Defaults to
+ .
+
+
+
+
+
Sockets and FIFOs