summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKay Sievers <kay@vrfy.org>2013-01-16 03:46:38 +0100
committerKay Sievers <kay@vrfy.org>2013-01-16 04:26:49 +0100
commit3f141375cb4ff4f850b267258e776c90df594990 (patch)
treef412fdd3978498c751f5be2220c16ec343fcc1e6
parent0c08f5cde749bd2818475e487109cd0d413452df (diff)
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
-rw-r--r--Makefile.am1
-rw-r--r--man/systemd.special.xml28
-rw-r--r--src/core/service.c8
-rw-r--r--src/core/special.h2
-rw-r--r--units/mail-transfer-agent.target13
5 files changed, 0 insertions, 52 deletions
diff --git a/Makefile.am b/Makefile.am
index 9c7267b064..b64e781372 100644
--- 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/mail-transfer-agent.target \
units/hibernate.target \
units/hybrid-sleep.target \
units/poweroff.target \
diff --git a/man/systemd.special.xml b/man/systemd.special.xml
index 35c5a28a1b..fc625db80d 100644
--- 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>mail-transfer-agent.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>
- <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>
@@ -368,25 +359,6 @@
</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>
<para>A special target unit
diff --git a/src/core/service.c b/src/core/service.c
index 7eaac0dc4c..017d292a8b 100644
--- 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,
-
- /* 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;
@@ -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);
-
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 ef72260ecd..626e816922 100644
--- 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_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:
diff --git a/units/mail-transfer-agent.target b/units/mail-transfer-agent.target
deleted file mode 100644
index d2f24d15b9..0000000000
--- 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)