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

[elogind.git] / src / service.c

diff --git a/src/service.c b/src/service.c
index 6539a24102d086463dffdd4f762ec13bd83b97d1..2d7ab70c1945a462643cb5a40825f870165ba1aa 100644 (file)
--- 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
         };
 
@@ -824,22 +825,6 @@ static int service_load_sysv(Service *s) {
         return 0;
 }
 
-static int service_add_bus_name(Service *s) {
-        char *n;
-        int r;
-
-        assert(s);
-        assert(s->bus_name);
-
-        if (asprintf(&n, "dbus-%s.service", s->bus_name) < 0)
-                return 0;
-
-        r = unit_merge_by_name(UNIT(s), n);
-        free(n);
-
-        return r;
-}
-
 static int service_verify(Service *s) {
         assert(s);
 
@@ -929,13 +914,9 @@ static int service_load(Unit *u) {
                 if ((r = sysv_fix_order(s)) < 0)
                         return r;
 
-                if (s->bus_name) {
-                        if ((r = service_add_bus_name(s)) < 0)
-                                return r;
-
+                if (s->bus_name)
                         if ((r = unit_watch_bus_name(u, s->bus_name)) < 0)
                                 return r;
-                }
 
                 if (s->type == SERVICE_NOTIFY && s->notify_access == NOTIFY_NONE)
                         s->notify_access = NOTIFY_MAIN;
@@ -2747,11 +2728,12 @@ static int service_enumerate(Manager *m) {
 
                                 if (de->d_name[0] == 'S')  {
 
-                                        SERVICE(service)->sysv_start_priority =
-                                                MAX(a*10 + b, SERVICE(service)->sysv_start_priority);
+                                        if (rcnd_table[i].type == RUNLEVEL_UP || rcnd_table[i].type == RUNLEVEL_SYSINIT) {
+                                                SERVICE(service)->sysv_start_priority =
+                                                        MAX(a*10 + b, SERVICE(service)->sysv_start_priority);
 
-                                        if (rcnd_table[i].type == RUNLEVEL_UP || rcnd_table[i].type == RUNLEVEL_SYSINIT)
                                                 SERVICE(service)->sysv_enabled = true;
+                                        }
 
                                         if ((r = set_ensure_allocated(&runlevel_services[i], trivial_hash_func, trivial_compare_func)) < 0)
                                                 goto finish;