[systemd-commits] 2 commits - src/service.c src/special.h

[Lennart Poettering]

 src/service.c |    9 ++++++---
 src/special.h |    1 +
 2 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 32159d3a94c6ef00555546e1caef2eacad62310a
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Sep 13 23:54:21 2010 +0200

    service: add generic LSB provides handling for facilities

diff --git a/src/service.c b/src/service.c
index 2d7ab70..c154257 100644
--- a/src/service.c
+++ b/src/service.c
@@ -277,9 +277,11 @@ static int sysv_translate_facility(const char *name, char **_r) {
                 }
 
         if (*name == '$')
-                return 0;
+                r = unit_name_build(name+1, NULL, ".target");
+        else
+                r = sysv_translate_name(name);
 
-        if (!(r = sysv_translate_name(name)))
+        if (!r)
                 return -ENOMEM;
 
 finish:
commit 4f7dcad328249b80580aed5de73bd754db19351c
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Sep 13 23:53:59 2010 +0200

    service: translate 'httpd' LSB Provides into '$httpd' on Fedora

diff --git a/src/service.c b/src/service.c
index 1dc3e1e..2d7ab70 100644
--- a/src/service.c
+++ b/src/service.c
@@ -260,7 +260,8 @@ static int sysv_translate_facility(const char *name, char **_r) {
 #ifdef TARGET_FEDORA
                 /* Fedora extensions, lacking the $ prefix */
                 "MTA",        SPECIAL_MAIL_TRANSFER_AGENT_TARGET,
-                "smtpdaemon", SPECIAL_MAIL_TRANSFER_AGENT_TARGET
+                "smtpdaemon", SPECIAL_MAIL_TRANSFER_AGENT_TARGET,
+                "httpd",      SPECIAL_HTTP_DAEMON_TARGET,
 #endif
         };
 
diff --git a/src/special.h b/src/special.h
index d0359db..ca24121 100644
--- a/src/special.h
+++ b/src/special.h
@@ -47,6 +47,7 @@
 #define SPECIAL_RTC_SET_TARGET "rtc-set.target"           /* LSB's $time */
 #define SPECIAL_DISPLAY_MANAGER_SERVICE "display-manager.service"       /* Debian's $x-display-manager */
 #define SPECIAL_MAIL_TRANSFER_AGENT_TARGET "mail-transfer-agent.target" /* Debian's $mail-{transport|transfer-agent */
+#define SPECIAL_HTTP_DAEMON_TARGET "http-daemon.target"
 #define SPECIAL_DBUS_TARGET "dbus.target"
 #define SPECIAL_BASIC_TARGET "basic.target"
 #define SPECIAL_SOCKETS_TARGET "sockets.target"