service: sysv - remove distribution specific targets

Systemd should not introduce any new facilities. Distributions which still
need to support their non-standard/legacy facilities should add them as
patches to their packaging.

The following facilities are no longer recognized:
  $x-display-manager
  $mail-transfer-agent
  $mail-transport-agent
  $mail-transfer-agent
  $smtp
  $null

This target is no longer available:
  mail-transfer-agent.target

diff --git a/Makefile.am b/Makefile.am
index 9c7267b06491db2fb2ce45a3bf8de70e56ef4f4f..b64e7813722e8b5f02950e53d1d31daf012aa7f4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -259,7 +259,6 @@ dist_systemunit_DATA = \
        units/network.target \
        units/nss-lookup.target \
        units/nss-user-lookup.target \
        units/network.target \
        units/nss-lookup.target \
        units/nss-user-lookup.target \

-       units/mail-transfer-agent.target \

        units/hibernate.target \
        units/hybrid-sleep.target \
        units/poweroff.target \
        units/hibernate.target \
        units/hybrid-sleep.target \
        units/poweroff.target \

diff --git a/man/systemd.special.xml b/man/systemd.special.xml
index 35c5a28a1b454a202c995f3f10ec41ea4b2235cc..fc625db80ddc5d8c999d99a7494b3f183ddf6808 100644 (file)
--- a/man/systemd.special.xml
+++ b/man/systemd.special.xml
@@ -68,7 +68,6 @@
                 <filename>kexec.target</filename>,
                 <filename>local-fs.target</filename>,
                 <filename>local-fs-pre.target</filename>,
                 <filename>kexec.target</filename>,
                 <filename>local-fs.target</filename>,
                 <filename>local-fs-pre.target</filename>,

-                <filename>mail-transfer-agent.target</filename>,

                 <filename>multi-user.target</filename>,
                 <filename>network.target</filename>,
                 <filename>nss-lookup.target</filename>,
                 <filename>multi-user.target</filename>,
                 <filename>network.target</filename>,
                 <filename>nss-lookup.target</filename>,


@@ -214,14 +213,6 @@
                                         <filename>gdm.service</filename>
                                         or a similar display manager
                                         service.</para>
                                         <filename>gdm.service</filename>
                                         or a similar display manager
                                         service.</para>

-                                        <para>systemd automatically
-                                        adds dependencies of type
-                                        After for this target unit to
-                                        all SysV init script service
-                                        units with a LSB header
-                                        referring to the
-                                        <literal>$x-display-manager</literal>
-                                        facility.</para>

                                 </listitem>
                         </varlistentry>
                         <varlistentry>
                                 </listitem>
                         </varlistentry>
                         <varlistentry>


@@ -367,25 +358,6 @@
                                         all local mounts.</para>
                                 </listitem>
                         </varlistentry>
                                         all local mounts.</para>
                                 </listitem>
                         </varlistentry>

-                        <varlistentry>
-                                <term><filename>mail-transfer-agent.target</filename></term>
-                                <listitem>
-                                        <para>The mail transfer agent
-                                        (MTA) service. Usually this
-                                        should pull-in all units
-                                        necessary for
-                                        sending/receiving mails on the
-                                        local host.</para>
-
-                                        <para>systemd automatically
-                                        adds dependencies of type
-                                        After for this target unit to
-                                        all SysV init script service
-                                        units with an LSB header
-                                        referring to the
-                                        <literal>$mail-transfer-agent</literal>.</para>
-                                </listitem>
-                        </varlistentry>

                         <varlistentry>
                                 <term><filename>multi-user.target</filename></term>
                                 <listitem>
                         <varlistentry>
                                 <term><filename>multi-user.target</filename></term>
                                 <listitem>

diff --git a/src/core/service.c b/src/core/service.c
index 7eaac0dc4cb7e9f4437cdaca5282be9be280e3c6..017d292a8b70d3db51003c45b5ec1d7171c50a90 100644 (file)
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -359,13 +359,6 @@ static int sysv_translate_facility(const char *name, const char *filename, char
                 "remote_fs",            SPECIAL_REMOTE_FS_TARGET,
                 "syslog",               SPECIAL_SYSLOG_TARGET,
                 "time",                 SPECIAL_TIME_SYNC_TARGET,
                 "remote_fs",            SPECIAL_REMOTE_FS_TARGET,
                 "syslog",               SPECIAL_SYSLOG_TARGET,
                 "time",                 SPECIAL_TIME_SYNC_TARGET,

-
-                /* common extensions */
-                "mail-transfer-agent",  SPECIAL_MAIL_TRANSFER_AGENT_TARGET,
-                "x-display-manager",    SPECIAL_DISPLAY_MANAGER_SERVICE,
-                "null",                 NULL,
-                "mail-transport-agent", SPECIAL_MAIL_TRANSFER_AGENT_TARGET,
-                "smtp",                 SPECIAL_MAIL_TRANSFER_AGENT_TARGET,

         };
 
         unsigned i;
         };
 
         unsigned i;


@@ -815,7 +808,6 @@ static int service_load_sysv_path(Service *s, const char *path) {
                                         }
 
                                         r = sysv_translate_facility(n, path_get_file_name(path), &m);
                                         }
 
                                         r = sysv_translate_facility(n, path_get_file_name(path), &m);

-

                                         if (r < 0) {
                                                 log_error_unit(u->id,
                                                                "[%s:%u] Failed to translate LSB dependency %s, ignoring: %s",
                                         if (r < 0) {
                                                 log_error_unit(u->id,
                                                                "[%s:%u] Failed to translate LSB dependency %s, ignoring: %s",

diff --git a/src/core/special.h b/src/core/special.h
index ef72260ecd52712ff5b6b0df1ead290da382fbfb..626e816922d2f27210f89501dc1293b0291aed7e 100644 (file)
--- a/src/core/special.h
+++ b/src/core/special.h
@@ -59,8 +59,6 @@
 #define SPECIAL_RPCBIND_TARGET "rpcbind.target"           /* LSB's $portmap */
 #define SPECIAL_SYSLOG_TARGET "syslog.target"             /* LSB's $syslog */
 #define SPECIAL_TIME_SYNC_TARGET "time-sync.target"       /* LSB's $time */
 #define SPECIAL_RPCBIND_TARGET "rpcbind.target"           /* LSB's $portmap */
 #define SPECIAL_SYSLOG_TARGET "syslog.target"             /* LSB's $syslog */
 #define SPECIAL_TIME_SYNC_TARGET "time-sync.target"       /* LSB's $time */

-#define SPECIAL_DISPLAY_MANAGER_SERVICE "display-manager.service" /* Common extension of LSB */
-#define SPECIAL_MAIL_TRANSFER_AGENT_TARGET "mail-transfer-agent.target" /* Common extension of LSB */

 
 /*
  * Rules regarding adding further high level targets like the above:
 
 /*
  * Rules regarding adding further high level targets like the above:

diff --git a/units/mail-transfer-agent.target b/units/mail-transfer-agent.target
deleted file mode 100644 (file)
index d2f24d1..0000000
--- a/units/mail-transfer-agent.target
+++ /dev/null
@@ -1,13 +0,0 @@
-#  This file is part of systemd.
-#
-#  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.
-
-# This exists mostly for compatibility with SysV/LSB units, and
-# implementations lacking socket/bus activation.
-
-[Unit]
-Description=Mail Transfer Agent
-Documentation=man:systemd.special(7)