[systemd-commits] 2 commits - src/service.c units/graphical.target.m4 units/multi-user.target.m4

[Lennart Poettering]

 src/service.c              |   10 +++++++++-
 units/graphical.target.m4  |    2 +-
 units/multi-user.target.m4 |    2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

New commits:
commit 1740dc8bc2588473e84709e1c6b8b41a180bb224
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Aug 26 02:36:04 2010 +0200

    units: don't install runlevel links anymore, since thsoe are maintained in /lib now

diff --git a/units/graphical.target.m4 b/units/graphical.target.m4
index c153409..a80fecf 100644
--- a/units/graphical.target.m4
+++ b/units/graphical.target.m4
@@ -22,4 +22,4 @@ Names=runlevel5.target
 )m4_dnl
 
 [Install]
-Alias=default.target m4_ifdef(`TARGET_FEDORA', runlevel5.target)
+Alias=default.target
diff --git a/units/multi-user.target.m4 b/units/multi-user.target.m4
index 2029297..6f384fe 100644
--- a/units/multi-user.target.m4
+++ b/units/multi-user.target.m4
@@ -22,4 +22,4 @@ Names=runlevel3.target
 )m4_dnl
 
 [Install]
-Alias=default.target m4_ifdef(`TARGET_FEDORA', runlevel2.target runlevel3.target runlevel4.target)
+Alias=default.target
commit 3177a49ce9e21df6894cdea4f256d60b8e556c81
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Aug 26 02:28:37 2010 +0200

    service: properly handle Fedora's broken MTA meta-service name

diff --git a/src/service.c b/src/service.c
index d52856a..56c8502 100644
--- a/src/service.c
+++ b/src/service.c
@@ -251,9 +251,17 @@ static int sysv_translate_facility(const char *name, char **_r) {
                 "$time",      SPECIAL_RTC_SET_TARGET,
 
                 /* Debian extensions */
+#ifdef TARGET_DEBIAN
                 "$mail-transport-agent", SPECIAL_MAIL_TRANSFER_AGENT_TARGET,
+#endif
                 "$mail-transfer-agent",  SPECIAL_MAIL_TRANSFER_AGENT_TARGET,
-                "$x-display-manager",    SPECIAL_DISPLAY_MANAGER_SERVICE
+                "$x-display-manager",    SPECIAL_DISPLAY_MANAGER_SERVICE,
+
+#ifdef TARGET_FEDORA
+                /* Fedora extensions, lacking the $ prefix */
+                "MTA",        SPECIAL_MAIL_TRANSFER_AGENT_TARGET,
+                "smtpdaemon", SPECIAL_MAIL_TRANSFER_AGENT_TARGET
+#endif
         };
 
         unsigned i;