manager: rename 'maintenance' state to 'failed' to avoid user confusion

[elogind.git] / src / service.c

diff --git a/src/service.c b/src/service.c
index d2ef1ad9070e11993ec103d1b16e04d42881b4f5..56c8502500f5c37e3b4667a8c560ae35c84d8531 100644 (file)
--- 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;
@@ -571,10 +579,10 @@ static int service_load_sysv_path(Service *s, const char *path) {
                                         else
                                                 r = unit_add_dependency_by_name_inverse(u, UNIT_AFTER, m, NULL, true);
 
-                                        free(m);
-
                                         if (r < 0)
-                                                goto finish;
+                                                log_error("[%s:%u] Failed to add LSB Provides name %s, ignoring: %s", path, line, m, strerror(-r));
+
+                                        free(m);
                                 }
 
                         } else if (startswith_no_case(t, "Required-Start:") ||
@@ -604,10 +612,11 @@ static int service_load_sysv_path(Service *s, const char *path) {
                                                 continue;
 
                                         r = unit_add_dependency_by_name(u, startswith_no_case(t, "X-Start-Before:") ? UNIT_BEFORE : UNIT_AFTER, m, NULL, true);
-                                        free(m);
 
                                         if (r < 0)
-                                                goto finish;
+                                                log_error("[%s:%u] Failed to add dependency on %s, ignoring: %s", path, line, m, strerror(-r));
+
+                                        free(m);
                                 }
                         } else if (startswith_no_case(t, "Default-Start:")) {
                                 char *k, *d;