man: document a few special units

diff --git a/.gitignore b/.gitignore
index 4efd8247961d396d5a076898a3ae70a7dcc5fd9a..700a085ad76764159bb305edadc25210e31ed073 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@ systemctl
 systemadm
 .dirstamp
 *.5
+*.7
 *.html
 *~
 *.tar.gz

diff --git a/Makefile.am b/Makefile.am
index 780ded62fa95655168dd5a847e519e2b6ec63ed5..15da7b24390cee5d103fcd03eb40ff12796a8f9c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -156,18 +156,21 @@ EXTRA_DIST += \
 
 dist_man_MANS = \
        man/systemd.unit.5 \
-       man/systemd.service.5
+       man/systemd.service.5 \
+       man/systemd.special.7
 
 HTMLMANS = \
        man/systemd.unit.html \
-       man/systemd.service.html
+       man/systemd.service.html \
+       man/systemd.special.html
 
 dist_noinst_DATA = \
        $(HTMLMANS)
 
 EXTRA_DIST += \
        man/systemd.unit.xml \
-       man/systemd.service.xml
+       man/systemd.service.xml \
+       man/systemd.special.xml
 
 systemd_SOURCES = \
        $(COMMON_SOURCES) \
@@ -297,7 +300,7 @@ CLEANFILES = \
        units/syslog.target
 
 if HAVE_XSLTPROC
-man/%.5: man/%.xml
+man/%.5 man/%.7: man/%.xml
        $(MKDIR_P) man
        $(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
 

diff --git a/man/systemd.special.xml b/man/systemd.special.xml
new file mode 100644 (file)
index 0000000..3f9286d
--- /dev/null
+++ b/man/systemd.special.xml
@@ -0,0 +1,325 @@
+<?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 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
+  (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.
+
+  You should have received a copy of the GNU General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<refentry id="systemd.special">
+
+        <refentryinfo>
+                <title>systemd.special</title>
+                <productname>systemd</productname>
+
+                <authorgroup>
+                        <author>
+                                <contrib>Developer</contrib>
+                                <firstname>Lennart</firstname>
+                                <surname>Poettering</surname>
+                                <email>lennart@poettering.net</email>
+                        </author>
+                </authorgroup>
+        </refentryinfo>
+
+        <refmeta>
+                <refentrytitle>systemd.special</refentrytitle>
+                <manvolnum>7</manvolnum>
+        </refmeta>
+
+        <refnamediv>
+                <refname>systemd.special</refname>
+                <refpurpose>special systemd units</refpurpose>
+        </refnamediv>
+
+        <refsynopsisdiv>
+                <para><filename>emergency.service</filename></para>
+                <para><filename>local-fs.target</filename></para>
+                <para><filename>network.target</filename></para>
+                <para><filename>nss-lookup.target</filename></para>
+                <para><filename>remote-fs.target</filename></para>
+                <para><filename>rpcbind.target</filename></para>
+                <para><filename>rtc-set.target</filename></para>
+                <para><filename>shutdown.target</filename></para>
+                <para><filename>sigpwr.target</filename></para>
+                <para><filename>sockets.target</filename></para>
+                <para><filename>swap.target</filename></para>
+                <para><filename>syslog.target</filename></para>
+                <para><filename>systemd-initctl.service</filename></para>
+                <para><filename>systemd-initctl.socket</filename></para>
+                <para><filename>systemd-logger.service</filename></para>
+                <para><filename>systemd-logger.socket</filename></para>
+        </refsynopsisdiv>
+
+        <refsect1>
+                <title>Description</title>
+
+                <para>A few units are treated specially by
+                systemd. They have special internal semantics and
+                cannot be renamed.</para>
+        </refsect1>
+
+        <refsect1>
+                <title>Special System Units</title>
+
+                <variablelist>
+                        <varlistentry>
+                                <term><filename>emergency.service</filename></term>
+                                <listitem>
+                                        <para>A special service unit
+                                        that starts an emergency
+                                        shell on the main
+                                        console. This unit is supposed
+                                        to be used with the kernel
+                                        command line option
+                                        <varname>systemd.default=</varname>
+                                        and has otherwise little use.
+                                        </para>
+                                </listitem>
+                        </varlistentry>
+                        <varlistentry>
+                                <term><filename>local-fs.target</filename></term>
+                                <listitem>
+                                        <para>systemd automatically
+                                        adds dependencies of type
+                                        After to all mount units that
+                                        refer to local mount
+                                        points. In addition, systemd
+                                        adds dependencies of type
+                                        Wants to those mounts listed
+                                        in
+                                        <filename>/etc/fstab</filename>
+                                        that have the
+                                        <literal>auto</literal> and
+                                        <literal>comment=systemd.mount</literal>
+                                        mount options set.</para>
+
+                                        <para>systemd automatically
+                                        adds dependencies of type
+                                        After to this target unit for
+                                        all SysV init scripts with an
+                                        LSB header referring to the
+                                        <literal>$local_fs</literal>
+                                        facility.</para>
+                                </listitem>
+                        </varlistentry>
+                        <varlistentry>
+                                <term><filename>network.target</filename></term>
+                                <listitem>
+                                        <para>systemd automatically
+                                        adds dependencies of type
+                                        After to this target unit for
+                                        all SysV init scripts with an
+                                        LSB header referring to the
+                                        <literal>$network</literal>
+                                        facility.</para>
+                                </listitem>
+                        </varlistentry>
+                        <varlistentry>
+                                <term><filename>nss-lookup.target</filename></term>
+                                <listitem>
+                                        <para>systemd automatically
+                                        adds dependencies of type
+                                        After to this target unit for
+                                        all SysV init scripts with an
+                                        LSB header referring to the
+                                        <literal>$named</literal>
+                                        facility.</para>
+                                </listitem>
+                        </varlistentry>
+                        <varlistentry>
+                                <term><filename>remote-fs.target</filename></term>
+                                <listitem>
+                                        <para>Similar to <filename>local-fs.target</filename>, but for remote mount points.</para>
+                                        <para>systemd automatically
+                                        adds dependencies of type
+                                        After to this target unit for
+                                        all SysV init scripts with an
+                                        LSB header referring to the
+                                        <literal>$remote-fs</literal>
+                                        facility.</para>
+                                </listitem>
+                        </varlistentry>
+                        <varlistentry>
+                                <term><filename>rpcbind.target</filename></term>
+                                <listitem>
+                                        <para>systemd automatically
+                                        adds dependencies of type
+                                        After to this target unit for
+                                        all SysV init scripts with an
+                                        LSB header referring to the
+                                        <literal>$rpcbind</literal>
+                                        facility.</para>
+                                </listitem>
+                        </varlistentry>
+                        <varlistentry>
+                                <term><filename>rtc-set.target</filename></term>
+                                <listitem>
+                                        <para>systemd automatically
+                                        adds dependencies of type
+                                        After to this target unit for
+                                        all SysV init scripts with an
+                                        LSB header referring to the
+                                        <literal>$time</literal>
+                                        facility.</para>
+                                </listitem>
+                        </varlistentry>
+                        <varlistentry>
+                                <term><filename>shutdown.target</filename></term>
+                                <listitem>
+                                        <para>A special target unit
+                                        that terminates the services
+                                        on system shutdown.</para>
+
+                                        <para>Services that shall be
+                                        terminated on system shutdown
+                                        shall add Wants dependencies
+                                        from this unit to their
+                                        service unit during
+                                        installation.</para>
+
+                                        <para>systemd automatically
+                                        adds dependencies of type
+                                        Conflicts to this target unit
+                                        for all SysV init scripts that
+                                        shall be terminated in SysV
+                                        runlevels 0 or 6.</para>
+                                </listitem>
+                        </varlistentry>
+                        <varlistentry>
+                                <term><filename>sigpwr.target</filename></term>
+                                <listitem>
+                                        <para>A special target that is
+                                        started when systemd receives
+                                        the SIGPWR process signal,
+                                        which is normally sent by the
+                                        kernel or UPS daemons when the
+                                        power fails.</para>
+                                </listitem>
+                        </varlistentry>
+                        <varlistentry>
+                                <term><filename>sockets.target</filename></term>
+                                <listitem>
+                                        <para>A special target unit
+                                        that sets up all service
+                                        sockets.</para>
+
+                                        <para>Services that can be
+                                        socket-activated shall add
+                                        Wants dependencies from this
+                                        unit to their socket unit
+                                        during installation.</para>
+                                </listitem>
+                        </varlistentry>
+                        <varlistentry>
+                                <term><filename>swap.target</filename></term>
+                                <listitem>
+                                        <para>Similar to
+                                        <filename>local-fs.target</filename>, but for swap
+                                        partitions and swap
+                                        files.</para>
+                                </listitem>
+                        </varlistentry>
+                        <varlistentry>
+                                <term><filename>syslog.target</filename></term>
+                                <listitem>
+                                        <para>systemd automatically
+                                        adds dependencies of type
+                                        After to this target unit for
+                                        all SysV init scripts with an
+                                        LSB header referring to the
+                                        <literal>$syslog</literal>
+                                        facility.</para>
+
+                                        <para>Administrators should
+                                        ensure that this target pulls
+                                        in a service unit with the
+                                        name or alias of
+                                        <filename>@SPECIAL_SYSLOG_NAME@</filename> (or a
+                                        socket unit that activates
+                                        this service).</para>
+                                </listitem>
+                        </varlistentry>
+                        <varlistentry>
+                                <term><filename>systemd-initctl.service</filename></term>
+                                <listitem>
+                                        <para>This provides
+                                        compatibility with the SysV
+                                        /dev/initctl file system FIFO
+                                        for communication with the
+                                        init system.</para>
+                                        <para>This is a
+                                        socket-activated service, see
+                                        <filename>system-initctl.socket</filename>.</para>
+                                </listitem>
+                        </varlistentry>
+                        <varlistentry>
+                                <term><filename>systemd-initctl.socket</filename></term>
+                                <listitem>
+                                        <para>Socket activation unit
+                                        for
+                                        <filename>system-initctl.service</filename>.</para>
+                                </listitem>
+                        </varlistentry>
+                        <varlistentry>
+                                <term><filename>systemd-logger.service</filename></term>
+                                <listitem>
+                                        <para>This is used internally
+                                        by systemd to provide syslog
+                                        logging to started
+                                        processes.</para>
+                                        <para>This is a
+                                        socket-activated service, see
+                                        <filename>system-logger.socket</filename>.</para>
+                                </listitem>
+                        </varlistentry>
+                        <varlistentry>
+                                <term><filename>systemd-logger.socket</filename></term>
+                                <listitem>
+                                        <para>Socket activation unit
+                                        for
+                                        <filename>system-logger.service</filename>.</para>
+                                </listitem>
+                        </varlistentry>
+                </variablelist>
+        </refsect1>
+
+        <refsect1>
+                <title>Special Session Units</title>
+
+                <para>When systemd runs as a service instance, the
+                following special units are available, which have
+                similar definitions as their system counterparts:
+                <filename>local-fs.target</filename>,
+                <filename>remote-fs.target</filename>,
+                <filename>shutdown.target</filename>,
+                <filename>sockets.target</filename>,
+                <filename>swap.target</filename>.</para>
+        </refsect1>
+
+        <refsect1>
+                  <title>See Also</title>
+                  <para>
+                          <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>
+                  </para>
+        </refsect1>
+
+</refentry>

diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index cfa1b09499288cc381f904fff27c501d0970d87b..4f71ffda777a5799c5028898a1544253dba5bb32 100644 (file)
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -77,7 +77,7 @@
 
                 <variablelist>
                         <varlistentry>
-                                <term>Names=</term>
+                                <term><varname>Names=</varname></term>
                                 <listitem>
                                         <para>Additional names for this unit. The names
                                         listed here mus have the same suffix (i.e. type)
@@ -86,7 +86,7 @@
                                 </listitem>
                         </varlistentry>
                         <varlistentry>
-                                <term>Requires=</term>
+                                <term><varname>Requires=</varname></term>
                                 <listitem>
                                         <para>Dependencies on other
                                         units. If this units get

diff --git a/src/manager.h b/src/manager.h
index 424ce879afcf52d30d7d306cc3079ab66f7cae30..78923003e25877999cd3d3c8a855cc032f8fba79 100644 (file)
--- a/src/manager.h
+++ b/src/manager.h
@@ -97,10 +97,10 @@ struct Watch {
 #define SPECIAL_SIGPWR_TARGET "sigpwr.target"
 #define SPECIAL_CTRL_ALT_DEL_TARGET "ctrl-alt-del.target"
 
-#define SPECIAL_LOCAL_FS_TARGET "local-fs.target"
-#define SPECIAL_REMOTE_FS_TARGET "remote-fs.target"
+#define SPECIAL_LOCAL_FS_TARGET "local-fs.target"         /* LSB's $local_fs */
+#define SPECIAL_REMOTE_FS_TARGET "remote-fs.target"       /* LSB's $remote_fs */
 #define SPECIAL_SWAP_TARGET "swap.target"
-#define SPECIAL_NETWORK_TARGET "network.target"
+#define SPECIAL_NETWORK_TARGET "network.target"           /* LSB's $network */
 #define SPECIAL_NSS_LOOKUP_TARGET "nss-lookup.target"     /* LSB's $named */
 #define SPECIAL_RPCBIND_TARGET "rpcbind.target"           /* LSB's $portmap */
 #define SPECIAL_SYSLOG_TARGET "syslog.target"             /* LSB's $syslog; Should pull in syslog.socket or syslog.service */

diff --git a/units/emergency.service b/units/emergency.service
index 13fca6fc60d857c893d6161d869c55e77c6d9b9e..6c4b870ec2531d094ea7d79ef2f860f96fd1fd29 100644 (file)
--- a/units/emergency.service
+++ b/units/emergency.service
@@ -15,6 +15,8 @@
 #  You should have received a copy of the GNU General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
+# See systemd.special(7) for details
+
 [Unit]
 Description=Emergency Shell
 

diff --git a/units/local-fs.target b/units/local-fs.target
index 3e7124a709ccabd2cfaaac548ffcf74b2b318d20..81bff5a89dd9e8665bcb889d19f2a3dc8a1741b9 100644 (file)
--- a/units/local-fs.target
+++ b/units/local-fs.target
@@ -15,5 +15,7 @@
 #  You should have received a copy of the GNU General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
+# See systemd.special(7) for details
+
 [Unit]
 Description=Local File Systems

diff --git a/units/network.target b/units/network.target
index cdb1b5eba61bb3676ad08e5d336201c03af4c5f0..a218c64633f3ae89a2c195cfa2ecc22a648108a3 100644 (file)
--- a/units/network.target
+++ b/units/network.target
@@ -15,5 +15,7 @@
 #  You should have received a copy of the GNU General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
+# See systemd.special(7) for details
+
 [Unit]
 Description=Network

diff --git a/units/nss-lookup.target b/units/nss-lookup.target
index d1ce0a7044909ab43fbff23f29b4685c06ab25fe..e8e659368a4301906789757e332bfa5f310ccb86 100644 (file)
--- a/units/nss-lookup.target
+++ b/units/nss-lookup.target
@@ -15,6 +15,8 @@
 #  You should have received a copy of the GNU General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
+# See systemd.special(7) for details
+
 [Unit]
 Description=Name Lookups
 Wants=network.target

diff --git a/units/remote-fs.target b/units/remote-fs.target
index 0ed324edce83c5df49ccde770e2a6ac8cd7ac8a6..177a773c90026061cc96aa664f439c85a12601d1 100644 (file)
--- a/units/remote-fs.target
+++ b/units/remote-fs.target
@@ -15,6 +15,8 @@
 #  You should have received a copy of the GNU General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
+# See systemd.special(7) for details
+
 [Unit]
 Description=Remote File Systems
 Requires=network.target

diff --git a/units/rtc-set.target b/units/rtc-set.target
index 626fa5a4a77bffd7a7088ad4bddfa0f99213fc4b..18c1ed35d8c891e243b3c071c6d8c7d69a930d17 100644 (file)
--- a/units/rtc-set.target
+++ b/units/rtc-set.target
@@ -15,5 +15,7 @@
 #  You should have received a copy of the GNU General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
+# See systemd.special(7) for details
+
 [Unit]
 Description=RTC Set

diff --git a/units/shutdown.target b/units/shutdown.target
index 87b1be8a20549969dce732f1f28a29a98717b072..37dca44e9fde1a8cbb8fb1f5e372c07508eebb60 100644 (file)
--- a/units/shutdown.target
+++ b/units/shutdown.target
@@ -15,5 +15,7 @@
 #  You should have received a copy of the GNU General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
+# See systemd.special(7) for details
+
 [Unit]
 Description=Shutdown

diff --git a/units/sigpwr.target b/units/sigpwr.target
index 36d4d24f8ba9b3491e0b93202a388104cac3f168..24f7d38dfe69b71519d649b3816a5ed35375ec3a 100644 (file)
--- a/units/sigpwr.target
+++ b/units/sigpwr.target
@@ -15,5 +15,7 @@
 #  You should have received a copy of the GNU General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
+# See systemd.special(7) for details
+
 [Unit]
 Description=Power Failure

diff --git a/units/sockets.target b/units/sockets.target
index 10610303e05eb4b1f740cbd2e6f656bd5583a8fe..00e698f457d2489ce1388d7cc186a78005038137 100644 (file)
--- a/units/sockets.target
+++ b/units/sockets.target
@@ -15,5 +15,7 @@
 #  You should have received a copy of the GNU General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
+# See systemd.special(7) for details
+
 [Unit]
 Description=Sockets

diff --git a/units/swap.target b/units/swap.target
index aac545619513f34eda3de4aba6127af893f69780..4f6e193dbea0537e0ea8f0bd3aa317f1378c18aa 100644 (file)
--- a/units/swap.target
+++ b/units/swap.target
@@ -15,5 +15,7 @@
 #  You should have received a copy of the GNU General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
+# See systemd.special(7) for details
+
 [Unit]
 Description=Swap

diff --git a/units/syslog.target.in b/units/syslog.target.in
index bcd645305eddb1336ead0c9af8cc5027d8322a1b..d21e7a72b245c2625e8083b8cfa6ade08941c9e6 100644 (file)
--- a/units/syslog.target.in
+++ b/units/syslog.target.in
@@ -15,6 +15,8 @@
 #  You should have received a copy of the GNU General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
+# See systemd.special(7) for details
+
 [Unit]
 Description=Syslog
 Requires=@SPECIAL_SYSLOG_SERVICE@

diff --git a/units/systemd-initctl.service.in b/units/systemd-initctl.service.in
index b6d5158f12bcb99ed1541db85b3433f53892f6a2..252a01429afb249128f5cc0df2aba222f2320589 100644 (file)
--- a/units/systemd-initctl.service.in
+++ b/units/systemd-initctl.service.in
@@ -15,6 +15,8 @@
 #  You should have received a copy of the GNU General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
+# See systemd.special(7) for details
+
 [Unit]
 Description=systemd /dev/initctl Compatibility Daemon
 

diff --git a/units/systemd-initctl.socket b/units/systemd-initctl.socket
index ff3dbacd30e274e46bf4e2eb1d726a065132e55f..acff32235d4640d6ea7b365206fba484b5645a32 100644 (file)
--- a/units/systemd-initctl.socket
+++ b/units/systemd-initctl.socket
@@ -15,6 +15,8 @@
 #  You should have received a copy of the GNU General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
+# See systemd.special(7) for details
+
 [Unit]
 Description=systemd /dev/initctl Compatibility Socket
 

diff --git a/units/systemd-logger.service.in b/units/systemd-logger.service.in
index ba6fa479439e0667d1a0fc3856f082065b0f961c..e4606ea70c1af2c744e6c8c7846c4ba9e8dc8d03 100644 (file)
--- a/units/systemd-logger.service.in
+++ b/units/systemd-logger.service.in
@@ -15,6 +15,8 @@
 #  You should have received a copy of the GNU General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
+# See systemd.special(7) for details
+
 [Unit]
 Description=systemd Logging Daemon
 

diff --git a/units/systemd-logger.socket b/units/systemd-logger.socket
index a1d11e8a2d5df4222a2341591f368e91e0451362..8d02ab48ca057190d79fcc747f6f559acd87a90e 100644 (file)
--- a/units/systemd-logger.socket
+++ b/units/systemd-logger.socket
@@ -15,6 +15,8 @@
 #  You should have received a copy of the GNU General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
+# See systemd.special(7) for details
+
 [Unit]
 Description=systemd Logging Socket