[systemd-commits] 3 commits - docs/gudev docs/libudev Makefile.am man/systemd.special.xml src/core TODO units/mail-transfer-agent.target
Kay Sievers
kay at kemper.freedesktop.org
Tue Jan 15 19:27:00 PST 2013
Makefile.am | 1 -
TODO | 4 ++++
docs/gudev/Makefile.am | 4 ++--
docs/libudev/Makefile.am | 4 ++--
man/systemd.special.xml | 28 ----------------------------
src/core/service.c | 8 --------
src/core/special.h | 2 --
units/mail-transfer-agent.target | 13 -------------
8 files changed, 8 insertions(+), 56 deletions(-)
New commits:
commit 3a7b06c8a8856381810352dce3369ca20f3b9fc6
Author: Kay Sievers <kay at vrfy.org>
Date: Wed Jan 16 04:22:46 2013 +0100
TODO: update
diff --git a/TODO b/TODO
index bfd6700..f8ea236 100644
--- a/TODO
+++ b/TODO
@@ -18,6 +18,9 @@ F18:
* Retest multi-seat
Features:
+* turn unused sysv early-boot stuff like $local-fs, $syslog into a NOP. systemd does
+ no longer support sysv early-boot scripts, these facilities can be silently ignored
+
* re-enable "make check" for gtk-doc (broken for unknown reason)
* logind: make PrepareForSuspend(false) an official api for notification of resumes
commit 9795da43c4b70fea1eef798d4aeb0467d6fb5f68
Author: Kay Sievers <kay at vrfy.org>
Date: Wed Jan 16 04:20:14 2013 +0100
doc: disable "make check" for gtk-doc
diff --git a/TODO b/TODO
index 7338e08..bfd6700 100644
--- a/TODO
+++ b/TODO
@@ -18,6 +18,7 @@ F18:
* Retest multi-seat
Features:
+* re-enable "make check" for gtk-doc (broken for unknown reason)
* logind: make PrepareForSuspend(false) an official api for notification of resumes
diff --git a/docs/gudev/Makefile.am b/docs/gudev/Makefile.am
index 26c8652..3a3a3e5 100644
--- a/docs/gudev/Makefile.am
+++ b/docs/gudev/Makefile.am
@@ -108,6 +108,6 @@ EXTRA_DIST += version.xml.in
# Comment this out if you want your docs-status tested during 'make check'
if ENABLE_GTK_DOC
-TESTS_ENVIRONMENT = cd $(top_srcdir)
-TESTS = $(GTKDOC_CHECK)
+#TESTS_ENVIRONMENT = cd $(top_srcdir)
+#TESTS = $(GTKDOC_CHECK)
endif
diff --git a/docs/libudev/Makefile.am b/docs/libudev/Makefile.am
index 87196e8..d96bac6 100644
--- a/docs/libudev/Makefile.am
+++ b/docs/libudev/Makefile.am
@@ -102,6 +102,6 @@ EXTRA_DIST += version.xml.in
# Comment this out if you want your docs-status tested during 'make check'
if ENABLE_GTK_DOC
-TESTS_ENVIRONMENT = cd $(top_srcdir)
-TESTS = $(GTKDOC_CHECK)
+#TESTS_ENVIRONMENT = cd $(top_srcdir)
+#TESTS = $(GTKDOC_CHECK)
endif
commit 3f141375cb4ff4f850b267258e776c90df594990
Author: Kay Sievers <kay at vrfy.org>
Date: Wed Jan 16 03:46:38 2013 +0100
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 9c7267b..b64e781 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 35c5a28..fc625db 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 7eaac0d..017d292 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 ef72260..626e816 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 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)
More information about the systemd-commits
mailing list