[systemd-commits] 4 commits - Makefile.am man/bootup.xml man/locale.conf.xml man/systemd-journald.service.xml man/systemd-random-seed-load.service.xml man/systemd-vconsole-setup.service.xml man/systemd.conf.xml man/systemd.special.xml man/systemd.xml man/vconsole.conf.xml units/hibernate.target units/sleep.target units/systemd-random-seed-load.service.in units/systemd-random-seed-save.service.in units/systemd-vconsole-setup.service.in
Lennart Poettering
lennart at kemper.freedesktop.org
Mon Jun 25 03:13:28 PDT 2012
Makefile.am | 20 ++
man/bootup.xml | 226 ++++++++++++++++++++++++++++++
man/locale.conf.xml | 7
man/systemd-journald.service.xml | 1
man/systemd-random-seed-load.service.xml | 80 ++++++++++
man/systemd-vconsole-setup.service.xml | 118 +++++++++++++++
man/systemd.conf.xml | 4
man/systemd.special.xml | 3
man/systemd.xml | 5
man/vconsole.conf.xml | 9 -
units/hibernate.target | 1
units/sleep.target | 1
units/systemd-random-seed-load.service.in | 1
units/systemd-random-seed-save.service.in | 1
units/systemd-vconsole-setup.service.in | 2
15 files changed, 467 insertions(+), 12 deletions(-)
New commits:
commit edcf89bebe6997b9ff47b7b32c0563ff9797dfb2
Author: Lennart Poettering <lennart at poettering.net>
Date: Mon Jun 25 12:13:17 2012 +0200
man: document systemd-random-seed-load.service
diff --git a/Makefile.am b/Makefile.am
index b7fb370..ca676e5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2484,6 +2484,17 @@ randomseed-install-data-hook:
INSTALL_DATA_HOOKS += \
randomseed-install-data-hook
+
+MANPAGES += \
+ man/systemd-random-seed-load.service.8
+
+MANPAGES_ALIAS += \
+ man/systemd-random-seed-save.service.8 \
+ man/systemd-random-seed.8
+
+man/systemd-random-seed-save.service.8: man/systemd-random-seed-load.service.8
+man/systemd-random-seed.8: man/systemd-random-seed-load.service.8
+
endif
# ------------------------------------------------------------------------------
diff --git a/man/systemd-random-seed-load.service.xml b/man/systemd-random-seed-load.service.xml
new file mode 100644
index 0000000..87f563e
--- /dev/null
+++ b/man/systemd-random-seed-load.service.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0"?>
+<!--*-nxml-*-->
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<!--
+ This file is part of systemd.
+
+ Copyright 2012 Lennart Poettering
+
+ systemd is free software; you can redistribute it and/or modify it
+ 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+-->
+<refentry id="systemd-random-seed-load.service">
+
+ <refentryinfo>
+ <title>systemd-random-seed-load.service</title>
+ <productname>systemd</productname>
+
+ <authorgroup>
+ <author>
+ <contrib>Developer</contrib>
+ <firstname>Lennart</firstname>
+ <surname>Poettering</surname>
+ <email>lennart at poettering.net</email>
+ </author>
+ </authorgroup>
+ </refentryinfo>
+
+ <refmeta>
+ <refentrytitle>systemd-random-seed-load.service</refentrytitle>
+ <manvolnum>8</manvolnum>
+ </refmeta>
+
+ <refnamediv>
+ <refname>systemd-random-seed-load.service</refname>
+ <refname>systemd-random-seed-save.service</refname>
+ <refname>systemd-random-seed</refname>
+ <refpurpose>Load and save the system random seed at boot and shutdown</refpurpose>
+ </refnamediv>
+
+ <refsynopsisdiv>
+ <para><filename>systemd-random-seed-load.service</filename></para>
+ <para><filename>systemd-random-seed-save.service</filename></para>
+ <para><filename>/usr/lib/systemd/systemd-random-seed</filename></para>
+ </refsynopsisdiv>
+
+ <refsect1>
+ <title>Description</title>
+
+ <para><filename>systemd-random-seed-load.service</filename>
+ is an early-boot service that restores the random seed
+ of the
+ system. <filename>systemd-random-seed-save.service</filename>
+ is a late-shutdown service that saves the random seed
+ of the system. See
+ <citerefentry><refentrytitle>random</refentrytitle><manvolnum>4</manvolnum></citerefentry>
+ for details. Saving/restoring the random seed across
+ boots increases the amount of available entropy early
+ at boot. On disk the random seed is stored in
+ <filename>/var/lib/random-seed</filename>.</para>
+ </refsect1>
+
+ <refsect1>
+ <title>See Also</title>
+ <para>
+ <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>random</refentrytitle><manvolnum>4</manvolnum></citerefentry>
+ </para>
+ </refsect1>
+
+</refentry>
diff --git a/units/systemd-random-seed-load.service.in b/units/systemd-random-seed-load.service.in
index a5e2bbb..8ea5750 100644
--- a/units/systemd-random-seed-load.service.in
+++ b/units/systemd-random-seed-load.service.in
@@ -7,6 +7,7 @@
[Unit]
Description=Load Random Seed
+Documentation=man:systemd-random-seed-load.service(8) man:random(4)
DefaultDependencies=no
Conflicts=shutdown.target
After=systemd-readahead-collect.service systemd-readahead-replay.service systemd-remount-fs.service
diff --git a/units/systemd-random-seed-save.service.in b/units/systemd-random-seed-save.service.in
index 0ebd07d..05b3c61 100644
--- a/units/systemd-random-seed-save.service.in
+++ b/units/systemd-random-seed-save.service.in
@@ -7,6 +7,7 @@
[Unit]
Description=Save Random Seed
+Documentation=man:systemd-random-seed-load.service(8) man:random(4)
DefaultDependencies=no
After=systemd-random-seed-load.service
Before=shutdown.target
commit c617f5a96d474a93e9cf38fbd97af257a08c40df
Author: Lennart Poettering <lennart at poettering.net>
Date: Mon Jun 25 12:01:09 2012 +0200
units: stop sleep.target when it has done its job
diff --git a/units/sleep.target b/units/sleep.target
index d7ebd28..10c7c8d 100644
--- a/units/sleep.target
+++ b/units/sleep.target
@@ -10,3 +10,4 @@ Description=Sleep
Documentation=man:systemd.special(7)
DefaultDependencies=no
RefuseManualStart=yes
+StopWhenUnneeded=yes
commit 4aa6e7782a1b693a8e4fa1d84c87dd76fe1e536d
Author: Lennart Poettering <lennart at poettering.net>
Date: Mon Jun 25 12:00:43 2012 +0200
man: document systemd-vconsole-setup.service
diff --git a/Makefile.am b/Makefile.am
index e4fcecb..b7fb370 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2381,7 +2381,13 @@ INSTALL_DATA_HOOKS += \
vconsole-install-data-hook
MANPAGES += \
- man/vconsole.conf.5
+ man/vconsole.conf.5 \
+ man/systemd-vconsole-setup.service.8
+
+MANPAGES_ALIAS += \
+ man/systemd-vconsole-setup.8
+
+man/systemd-vconsole-setup.8: man/systemd-vconsole-setup.service.8
EXTRA_DIST += \
units/systemd-vconsole-setup.service.in
diff --git a/man/locale.conf.xml b/man/locale.conf.xml
index 0c4d351..b90efea 100644
--- a/man/locale.conf.xml
+++ b/man/locale.conf.xml
@@ -55,7 +55,9 @@
<title>Description</title>
<para>The <filename>/etc/locale.conf</filename> file
- configures system-wide locale settings.</para>
+ configures system-wide locale settings. It is read at
+ early-boot by
+ <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>.</para>
<para>The basic file format of
<filename>locale.conf</filename> is a
@@ -139,7 +141,8 @@ LC_MESSAGES=C</programlisting>
<title>See Also</title>
<para>
<citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
- <citerefentry><refentrytitle>locale</refentrytitle><manvolnum>7</manvolnum></citerefentry>
+ <citerefentry><refentrytitle>locale</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>systemd-localed.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
</para>
</refsect1>
diff --git a/man/systemd-journald.service.xml b/man/systemd-journald.service.xml
index 5c4f031..43df3e7 100644
--- a/man/systemd-journald.service.xml
+++ b/man/systemd-journald.service.xml
@@ -153,7 +153,6 @@
</listitem>
</varlistentry>
-
</variablelist>
</refsect1>
diff --git a/man/systemd-vconsole-setup.service.xml b/man/systemd-vconsole-setup.service.xml
new file mode 100644
index 0000000..b4ad3c2
--- /dev/null
+++ b/man/systemd-vconsole-setup.service.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0"?>
+<!--*-nxml-*-->
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<!--
+ This file is part of systemd.
+
+ Copyright 2012 Lennart Poettering
+
+ systemd is free software; you can redistribute it and/or modify it
+ 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+-->
+<refentry id="systemd-vconsole-setup.service">
+
+ <refentryinfo>
+ <title>systemd-vconsole-setup.service</title>
+ <productname>systemd</productname>
+
+ <authorgroup>
+ <author>
+ <contrib>Developer</contrib>
+ <firstname>Lennart</firstname>
+ <surname>Poettering</surname>
+ <email>lennart at poettering.net</email>
+ </author>
+ </authorgroup>
+ </refentryinfo>
+
+ <refmeta>
+ <refentrytitle>systemd-vconsole-setup.service</refentrytitle>
+ <manvolnum>8</manvolnum>
+ </refmeta>
+
+ <refnamediv>
+ <refname>systemd-vconsole-setup.service</refname>
+ <refname>systemd-vconsole-setup</refname>
+ <refpurpose>Configure the virtual console at boot</refpurpose>
+ </refnamediv>
+
+ <refsynopsisdiv>
+ <para><filename>systemd-vconsole-setup.service</filename></para>
+ <para><filename>/usr/lib/systemd/systemd-vconsole-setup</filename></para>
+ </refsynopsisdiv>
+
+ <refsect1>
+ <title>Description</title>
+
+ <para><filename>systemd-vconsole-setup.service</filename>
+ is an early-boot service that configures the virtual
+ console font and console keymap. Internally it calls
+ <citerefentry><refentrytitle>loadkeys</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+ and
+ <citerefentry><refentrytitle>setfont</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
+
+ <para>See
+ <citerefentry><refentrytitle>vconsole.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+ for information about the configuration files understood by this
+ service.</para>
+
+
+ </refsect1>
+
+ <refsect1>
+ <title>Kernel Command Line</title>
+
+ <para>A few configuration parameters from
+ <filename>vconsole.conf</filename> may be overriden on
+ the kernel command line:</para>
+
+ <variablelist>
+ <varlistentry>
+ <term><varname>vconsole.keymap=</varname></term>
+ <term><varname>vconsole.keymap.toggle=</varname></term>
+
+ <listitem><para>Overrides the key
+ mapping table for the keybaord and the
+ second toggle keymap.</para></listitem>
+ </varlistentry>
+ <varlistentry>
+
+ <term><varname>vconsole.font=</varname></term>
+ <term><varname>vconsole.font.map=</varname></term>
+ <term><varname>vconsole.font.unimap=</varname></term>
+
+ <listitem><para>Configures the console
+ font, the console map, and the unicode
+ font map.</para></listitem>
+
+
+ </varlistentry>
+ </variablelist>
+
+ <para>See
+ <citerefentry><refentrytitle>vconsole.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+ for information about these settings.</para>
+ </refsect1>
+
+ <refsect1>
+ <title>See Also</title>
+ <para>
+ <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>vconsole.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>loadkeys</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>setfont</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>systemd-localed.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+ </para>
+ </refsect1>
+
+</refentry>
diff --git a/man/systemd.conf.xml b/man/systemd.conf.xml
index 613763e..fb038ea 100644
--- a/man/systemd.conf.xml
+++ b/man/systemd.conf.xml
@@ -48,8 +48,8 @@
</refnamediv>
<refsynopsisdiv>
- <para><filename>system.conf</filename></para>
- <para><filename>user.conf</filename></para>
+ <para><filename>/etc/systemd/system.conf</filename></para>
+ <para><filename>/etc/systemd/user.conf</filename></para>
</refsynopsisdiv>
<refsect1>
diff --git a/man/systemd.xml b/man/systemd.xml
index 5168049..75a0def 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -1223,6 +1223,8 @@
<refsect1>
<title>See Also</title>
<para>
+ <citerefentry><refentrytitle>systemd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>locale.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemadm</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd-notify</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
diff --git a/man/vconsole.conf.xml b/man/vconsole.conf.xml
index 72f1530..8617721 100644
--- a/man/vconsole.conf.xml
+++ b/man/vconsole.conf.xml
@@ -56,7 +56,8 @@
<para>The <filename>/etc/vconsole.conf</filename> file
configures the virtual console, i.e. keyboard mapping
- and console font.</para>
+ and console font. It is applied at boot by
+ <citerefentry><refentrytitle>systemd-vconsole-setup.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
<para>The basic file format of the
<filename>vconsole.conf</filename> is a
@@ -94,7 +95,7 @@
<term><varname>KEYMAP_TOGGLE=</varname></term>
<listitem><para>Configures the key
- mapping table of for they
+ mapping table for the
keyboard. <varname>KEYMAP=</varname>
defaults to <literal>us</literal> if
not set. The
@@ -137,9 +138,11 @@ FONT=latarcyrheb-sun16</programlisting>
<title>See Also</title>
<para>
<citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>systemd-vconsole-setup.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
<citerefentry><refentrytitle>loadkeys</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>setfont</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
- <citerefentry><refentrytitle>locale.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+ <citerefentry><refentrytitle>locale.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>systemd-localed.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
</para>
</refsect1>
diff --git a/units/hibernate.target b/units/hibernate.target
index 23a9f99..fc8493c 100644
--- a/units/hibernate.target
+++ b/units/hibernate.target
@@ -11,3 +11,4 @@ Documentation=man:systemd.special(7)
DefaultDependencies=no
BindTo=hibernate.service
After=hibernate.service
+StopWhenUnneeded=yes
diff --git a/units/systemd-vconsole-setup.service.in b/units/systemd-vconsole-setup.service.in
index 51fc0b5..18faa63 100644
--- a/units/systemd-vconsole-setup.service.in
+++ b/units/systemd-vconsole-setup.service.in
@@ -7,7 +7,7 @@
[Unit]
Description=Setup Virtual Console
-Documentation=man:vconsole.conf(5)
+Documentation=man:systemd-vconsole-setup.service(8) man:vconsole.conf(5)
DefaultDependencies=no
Conflicts=shutdown.target
After=systemd-readahead-collect.service systemd-readahead-replay.service
commit 013d8a39a6178179080bcfee9122b29cf9d29259
Author: Lennart Poettering <lennart at poettering.net>
Date: Fri Jun 22 23:14:19 2012 +0200
man: introduce bootup(7)
diff --git a/Makefile.am b/Makefile.am
index 276c226..e4fcecb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -462,6 +462,7 @@ MANPAGES = \
man/systemd.journal-fields.7 \
man/kernel-command-line.7 \
man/daemon.7 \
+ man/bootup.7 \
man/runlevel.8 \
man/telinit.8 \
man/halt.8 \
diff --git a/man/bootup.xml b/man/bootup.xml
new file mode 100644
index 0000000..ae84cff
--- /dev/null
+++ b/man/bootup.xml
@@ -0,0 +1,226 @@
+<?xml version='1.0'?> <!--*-nxml-*-->
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+
+<!--
+ This file is part of systemd.
+
+ Copyright 2012 Lennart Poettering
+
+ systemd is free software; you can redistribute it and/or modify it
+ 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<refentry id="bootup">
+
+ <refentryinfo>
+ <title>bootup</title>
+ <productname>systemd</productname>
+
+ <authorgroup>
+ <author>
+ <contrib>Developer</contrib>
+ <firstname>Lennart</firstname>
+ <surname>Poettering</surname>
+ <email>lennart at poettering.net</email>
+ </author>
+ </authorgroup>
+ </refentryinfo>
+
+ <refmeta>
+ <refentrytitle>bootup</refentrytitle>
+ <manvolnum>7</manvolnum>
+ </refmeta>
+
+ <refnamediv>
+ <refname>bootup</refname>
+ <refpurpose>The System Bootup Process</refpurpose>
+ </refnamediv>
+
+ <refsect1>
+ <title>Description</title>
+
+ <para>A number of different components are involved in the
+ system boot. Immediately after power-up, the system
+ BIOS will do minimal hardware initialization, and hand
+ control over to a boot loader stored on a persistant
+ storage device. This boot loader will then invoke an
+ OS kernel from disk (or the network). In the Linux
+ case this kernel now (optionally) extracts and
+ executes an initial RAM disk image (initrd) such as
+ <citerefentry><refentrytitle>dracut</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+ which looks for the root file system. After the root
+ file system is found and mounted the initrd hands over
+ control to the system manager (such as
+ <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>)
+ stored on the OS image which is then responsible for
+ probing all remaining hardware, mounting all necessary
+ file systems and spawning all configured
+ services.</para>
+
+ <para>On shutdown the system manager stops all
+ services, unmounts all file systems (detaching the
+ storage technologies backing them), and then
+ (optionally) jumps back into the initrd code which
+ unmounts/detaches the root file system and the storage
+ it resides on. As last step the system powered down.</para>
+
+ <para>Additional information about the system boot
+ process may be found in
+ <citerefentry><refentrytitle>boot</refentrytitle><manvolnum>7</manvolnum></citerefentry>.</para>
+ </refsect1>
+
+ <refsect1>
+ <title>System Manager Bootup</title>
+
+ <para>At boot, the system manager on the OS image is
+ responsible for initializing the required file
+ systems, services and drivers that are necessary for
+ operation of the system. On
+ <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+ systems this process is split up in various discrete
+ steps which are exposed as target units. (See
+ <citerefentry><refentrytitle>systemd.target</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+ for detailed information about target units.) The
+ boot-up process is highly parallelized so that the
+ order in which specific target units are reached is not
+ deterministic, but still adheres to a limited amount
+ of ordering structure.</para>
+
+ <para>When systemd starts up the system it will
+ activate all units that are dependencies of
+ <filename>default.target</filename> (as well as
+ recursively all dependencies of these
+ dependencies). Usually
+ <filename>default.target</filename> is simply an alias
+ of <filename>graphical.target</filename> or
+ <filename>multi-user.target</filename> depending on
+ whether the system is configured for a graphical UI or
+ only for a text console. To enforce minimal ordering
+ between the units pulled in a number of well-known
+ target units are available, as listed on
+ <citerefentry><refentrytitle>systemd.special</refentrytitle><manvolnum>7</manvolnum></citerefentry>.</para>
+
+ <para>The follow chart is a structural overview of
+ these well-known units and their position in the
+ boot-up logic. The arrows describe which units are
+ pulled in and ordered before which other units. Units
+ near the top are started before units nearer to the
+ bottom of the chart.</para>
+
+<programlisting>local-fs-pre.target
+ |
+ v
+(various mounts and (various swap (various cryptsetup
+ fsck services...) devices...) devices...) (various low-level (various low-level
+ | | | services: udevd, API VFS mounts:
+ v v v tmpfiles, random mqueue, configfs,
+ local-fs.target swap.target cryptsetup.target seed, sysctl, ...) debugfs, ...)
+ | | | | |
+ \__________________|_________________ | ___________________|____________________/
+ \|/
+ v
+ sysinit.target
+ |
+ _________________/|\___________________
+ / | \
+ | | |
+ v | v
+ (various | rescue.service
+ sockets...) | |
+ | | v
+ v | <emphasis>rescue.target</emphasis>
+ sockets.target |
+ | |
+ \_________________ |
+ \|
+ v
+ basic.target
+ |
+ _________________/| emergency.service
+ / | |
+ | | v
+ v v <emphasis>emergency.target</emphasis>
+ (various system (various system
+ services services)
+ required for |
+ graphical UIs) v
+ | <emphasis>multi-user.target</emphasis>
+ | |
+ | _________________/
+ |/
+ v
+ <emphasis>graphical.target</emphasis></programlisting>
+
+ <para>Target units that are commonly used as boot
+ targets are <emphasis>emphasized</emphasis>. These
+ units are good choices as goal targets, for
+ example by passing them to the
+ <varname>systemd.unit=</varname> kernel command line
+ option (see
+ <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>)
+ or by symlinking <filename>default.target</filename>
+ to them.</para>
+ </refsect1>
+
+ <refsect1>
+ <title>System Manager Shutdown</title>
+
+ <para>System shutdown also consists of various target
+ units with some minimal ordering structure
+ applied:</para>
+
+
+
+
+<programlisting> (conflicts with (conflicts with
+ all system all file system
+ services) mounts, swaps,
+ | cryptsetup
+ | devices, ...)
+ | |
+ v v
+ shutdown.target umount.target
+ | |
+ \_______ ______/
+ \ /
+ v
+ (various low-level
+ services)
+ |
+ v
+ final.target
+ |
+ __________________________/ \_____________________
+ / | | \
+ | | | |
+ v v v v
+reboot.service poweroff.service halt.service kexec.service
+ | | | |
+ v v v v
+<emphasis>reboot.target</emphasis> <emphasis>poweroff.target</emphasis> <emphasis>halt.target</emphasis> <emphasis>kexec.target</emphasis></programlisting>
+
+ <para>Commonly used system shutdown targets are <emphasis>emphasized</emphasis>.</para>
+ </refsect1>
+
+ <refsect1>
+ <title>See Also</title>
+ <para>
+ <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>boot</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>systemd.special</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>systemd.target</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+ </para>
+ </refsect1>
+
+</refentry>
diff --git a/man/systemd.special.xml b/man/systemd.special.xml
index 96befd5..4321f54 100644
--- a/man/systemd.special.xml
+++ b/man/systemd.special.xml
@@ -845,7 +845,8 @@
<citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd.socket</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
- <citerefentry><refentrytitle>systemd.target</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+ <citerefentry><refentrytitle>systemd.target</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>bootup</refentrytitle><manvolnum>7</manvolnum></citerefentry>
</para>
</refsect1>
diff --git a/man/systemd.xml b/man/systemd.xml
index d3d722a..5168049 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -1231,7 +1231,8 @@
<citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd.special</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
<citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
- <citerefentry><refentrytitle>kernel-command-line</refentrytitle><manvolnum>7</manvolnum></citerefentry>
+ <citerefentry><refentrytitle>kernel-command-line</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>bootup</refentrytitle><manvolnum>7</manvolnum></citerefentry>
</para>
</refsect1>
More information about the systemd-commits
mailing list