reword a few log messages

[elogind.git] / src / service.c

diff --git a/src/service.c b/src/service.c
index 2f699cd1e66a582e9c7f0653594b6ce2c6d18a01..e1975eb119112c4e7c7d8b9adc72201714969454 100644 (file)
--- a/src/service.c
+++ b/src/service.c
@@ -40,7 +40,7 @@
 typedef enum RunlevelType {
         RUNLEVEL_UP,
         RUNLEVEL_DOWN,
 typedef enum RunlevelType {
         RUNLEVEL_UP,
         RUNLEVEL_DOWN,

-        RUNLEVEL_BASIC
+        RUNLEVEL_SYSINIT

 } RunlevelType;
 
 static const struct {
 } RunlevelType;
 
 static const struct {


@@ -58,10 +58,10 @@ static const struct {
         { "rc6.d",  SPECIAL_RUNLEVEL6_TARGET, RUNLEVEL_DOWN },
 
         /* SUSE style boot.d */
         { "rc6.d",  SPECIAL_RUNLEVEL6_TARGET, RUNLEVEL_DOWN },
 
         /* SUSE style boot.d */

-        { "boot.d", SPECIAL_BASIC_TARGET,     RUNLEVEL_BASIC },
+        { "boot.d", SPECIAL_SYSINIT_TARGET,   RUNLEVEL_SYSINIT },

 
         /* Debian style rcS.d */
 
         /* Debian style rcS.d */

-        { "rcS.d",  SPECIAL_BASIC_TARGET,     RUNLEVEL_BASIC },
+        { "rcS.d",  SPECIAL_SYSINIT_TARGET,   RUNLEVEL_SYSINIT },

 };
 
 #define RUNLEVELS_UP "12345"
 };
 
 #define RUNLEVELS_UP "12345"


@@ -191,13 +191,19 @@ static char *sysv_translate_name(const char *name) {
 static int sysv_translate_facility(const char *name, char **_r) {
 
         static const char * const table[] = {
 static int sysv_translate_facility(const char *name, char **_r) {
 
         static const char * const table[] = {

+                /* LSB defined facilities */

                 "$local_fs",  SPECIAL_LOCAL_FS_TARGET,
                 "$network",   SPECIAL_NETWORK_TARGET,
                 "$named",     SPECIAL_NSS_LOOKUP_TARGET,
                 "$portmap",   SPECIAL_RPCBIND_TARGET,
                 "$remote_fs", SPECIAL_REMOTE_FS_TARGET,
                 "$syslog",    SPECIAL_SYSLOG_TARGET,
                 "$local_fs",  SPECIAL_LOCAL_FS_TARGET,
                 "$network",   SPECIAL_NETWORK_TARGET,
                 "$named",     SPECIAL_NSS_LOOKUP_TARGET,
                 "$portmap",   SPECIAL_RPCBIND_TARGET,
                 "$remote_fs", SPECIAL_REMOTE_FS_TARGET,
                 "$syslog",    SPECIAL_SYSLOG_TARGET,

-                "$time",      SPECIAL_RTC_SET_TARGET
+                "$time",      SPECIAL_RTC_SET_TARGET,
+
+                /* Debian extensions */
+                "$mail-transport-agent", SPECIAL_MAIL_TRANSFER_AGENT_TARGET,
+                "$mail-transfer-agent",  SPECIAL_MAIL_TRANSFER_AGENT_TARGET,
+                "$x-display-manager",    SPECIAL_DISPLAY_MANAGER_SERVICE

         };
 
         unsigned i;
         };
 
         unsigned i;


@@ -334,9 +340,6 @@ static int service_load_sysv_path(Service *s, const char *path) {
                 goto finish;
         }
 
                 goto finish;
         }
 

-        s->type = SERVICE_FORKING;
-        s->restart = SERVICE_ONCE;
-

         free(s->sysv_path);
         if (!(s->sysv_path = strdup(path))) {
                 r = -ENOMEM;
         free(s->sysv_path);
         if (!(s->sysv_path = strdup(path))) {
                 r = -ENOMEM;


@@ -379,7 +382,7 @@ static int service_load_sysv_path(Service *s, const char *path) {
 
                         /* Try to parse Red Hat style chkconfig headers */
 
 
                         /* Try to parse Red Hat style chkconfig headers */
 

-                        if (startswith(t, "chkconfig:")) {
+                        if (startswith_no_case(t, "chkconfig:")) {

                                 int start_priority;
                                 char runlevels[16], *k;
 
                                 int start_priority;
                                 char runlevels[16], *k;
 


@@ -416,7 +419,7 @@ static int service_load_sysv_path(Service *s, const char *path) {
                                         s->sysv_runlevels = d;
                                 }
 
                                         s->sysv_runlevels = d;
                                 }
 

-                        } else if (startswith(t, "description:")) {
+                        } else if (startswith_no_case(t, "description:")) {

 
                                 size_t k = strlen(t);
                                 char *d;
 
                                 size_t k = strlen(t);
                                 char *d;


@@ -434,7 +437,7 @@ static int service_load_sysv_path(Service *s, const char *path) {
                                 free(u->meta.description);
                                 u->meta.description = d;
 
                                 free(u->meta.description);
                                 u->meta.description = d;
 

-                        } else if (startswith(t, "pidfile:")) {
+                        } else if (startswith_no_case(t, "pidfile:")) {

 
                                 char *fn;
 
 
                                 char *fn;
 


@@ -479,7 +482,7 @@ static int service_load_sysv_path(Service *s, const char *path) {
 
                 } else if (state == LSB || state == LSB_DESCRIPTION) {
 
 
                 } else if (state == LSB || state == LSB_DESCRIPTION) {
 

-                        if (startswith(t, "Provides:")) {
+                        if (startswith_no_case(t, "Provides:")) {

                                 char *i, *w;
                                 size_t z;
 
                                 char *i, *w;
                                 size_t z;
 


@@ -515,8 +518,10 @@ static int service_load_sysv_path(Service *s, const char *path) {
                                                 goto finish;
                                 }
 
                                                 goto finish;
                                 }
 

-                        } else if (startswith(t, "Required-Start:") ||
-                                   startswith(t, "Should-Start:")) {
+                        } else if (startswith_no_case(t, "Required-Start:") ||
+                                   startswith_no_case(t, "Should-Start:") ||
+                                   startswith_no_case(t, "X-Start-Before:") ||
+                                   startswith_no_case(t, "X-Start-After:")) {

                                 char *i, *w;
                                 size_t z;
 
                                 char *i, *w;
                                 size_t z;
 


@@ -539,13 +544,13 @@ static int service_load_sysv_path(Service *s, const char *path) {
                                         if (r == 0)
                                                 continue;
 
                                         if (r == 0)
                                                 continue;
 

-                                        r = unit_add_dependency_by_name(u, UNIT_AFTER, m, NULL, true);
+                                        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;
                                 }
                                         free(m);
 
                                         if (r < 0)
                                                 goto finish;
                                 }

-                        } else if (startswith(t, "Default-Start:")) {
+                        } else if (startswith_no_case(t, "Default-Start:")) {

                                 char *k, *d;
 
                                 state = LSB;
                                 char *k, *d;
 
                                 state = LSB;


@@ -562,7 +567,7 @@ static int service_load_sysv_path(Service *s, const char *path) {
                                         s->sysv_runlevels = d;
                                 }
 
                                         s->sysv_runlevels = d;
                                 }
 

-                        } else if (startswith(t, "Description:")) {
+                        } else if (startswith_no_case(t, "Description:")) {

                                 char *d;
 
                                 state = LSB_DESCRIPTION;
                                 char *d;
 
                                 state = LSB_DESCRIPTION;


@@ -575,7 +580,7 @@ static int service_load_sysv_path(Service *s, const char *path) {
                                 free(u->meta.description);
                                 u->meta.description = d;
 
                                 free(u->meta.description);
                                 u->meta.description = d;
 

-                        } else if (startswith(t, "Short-Description:") &&
+                        } else if (startswith_no_case(t, "Short-Description:") &&

                                    !u->meta.description) {
                                 char *d;
 
                                    !u->meta.description) {
                                 char *d;
 


@@ -591,6 +596,19 @@ static int service_load_sysv_path(Service *s, const char *path) {
 
                                 u->meta.description = d;
 
 
                                 u->meta.description = d;
 

+                        } else if (startswith_no_case(t, "X-Interactive:")) {
+                                int b;
+
+                                if ((b = parse_boolean(strstrip(t+14))) < 0) {
+                                        log_warning("[%s:%u] Couldn't parse interactive flag. Ignoring.", path, line);
+                                        continue;
+                                }
+
+                                if (b)
+                                        s->exec_context.std_input = EXEC_INPUT_TTY;
+                                else
+                                        s->exec_context.std_input = EXEC_INPUT_NULL;
+

                         } else if (state == LSB_DESCRIPTION) {
 
                                 if (startswith(l, "#\t") || startswith(l, "#  ")) {
                         } else if (state == LSB_DESCRIPTION) {
 
                                 if (startswith(l, "#\t") || startswith(l, "#  ")) {


@@ -629,8 +647,10 @@ static int service_load_sysv_path(Service *s, const char *path) {
                 s->timeout_usec = 0;
 
         /* Special setting for all SysV services */
                 s->timeout_usec = 0;
 
         /* Special setting for all SysV services */

+        s->type = SERVICE_FORKING;

         s->valid_no_process = true;
         s->kill_mode = KILL_PROCESS_GROUP;
         s->valid_no_process = true;
         s->kill_mode = KILL_PROCESS_GROUP;

+        s->restart = SERVICE_ONCE;

 
         u->meta.load_state = UNIT_LOADED;
         r = 0;
 
         u->meta.load_state = UNIT_LOADED;
         r = 0;


@@ -1357,7 +1377,7 @@ static void service_enter_stop_post(Service *s, bool success) {
         return;
 
 fail:
         return;
 
 fail:

-        log_warning("%s failed to run stop-post executable: %s", UNIT(s)->meta.id, strerror(-r));
+        log_warning("%s failed to run 'stop-post' task: %s", UNIT(s)->meta.id, strerror(-r));

         service_enter_signal(s, SERVICE_FINAL_SIGTERM, false);
 }
 
         service_enter_signal(s, SERVICE_FINAL_SIGTERM, false);
 }
 


@@ -1453,7 +1473,7 @@ static void service_enter_stop(Service *s, bool success) {
         return;
 
 fail:
         return;
 
 fail:

-        log_warning("%s failed to run stop executable: %s", UNIT(s)->meta.id, strerror(-r));
+        log_warning("%s failed to run 'stop' task: %s", UNIT(s)->meta.id, strerror(-r));

         service_enter_signal(s, SERVICE_STOP_SIGTERM, false);
 }
 
         service_enter_signal(s, SERVICE_STOP_SIGTERM, false);
 }
 


@@ -1498,7 +1518,7 @@ static void service_enter_start_post(Service *s) {
         return;
 
 fail:
         return;
 
 fail:

-        log_warning("%s failed to run start-post executable: %s", UNIT(s)->meta.id, strerror(-r));
+        log_warning("%s failed to run 'start-post' task: %s", UNIT(s)->meta.id, strerror(-r));

         service_enter_stop(s, false);
 }
 
         service_enter_stop(s, false);
 }
 


@@ -1564,7 +1584,7 @@ static void service_enter_start(Service *s) {
         return;
 
 fail:
         return;
 
 fail:

-        log_warning("%s failed to run start exectuable: %s", UNIT(s)->meta.id, strerror(-r));
+        log_warning("%s failed to run 'start' task: %s", UNIT(s)->meta.id, strerror(-r));

         service_enter_signal(s, SERVICE_FINAL_SIGTERM, false);
 }
 
         service_enter_signal(s, SERVICE_FINAL_SIGTERM, false);
 }
 


@@ -1593,7 +1613,7 @@ static void service_enter_start_pre(Service *s) {
         return;
 
 fail:
         return;
 
 fail:

-        log_warning("%s failed to run start-pre executable: %s", UNIT(s)->meta.id, strerror(-r));
+        log_warning("%s failed to run 'start-pre' task: %s", UNIT(s)->meta.id, strerror(-r));

         service_enter_dead(s, false, true);
 }
 
         service_enter_dead(s, false, true);
 }
 


@@ -1640,7 +1660,7 @@ static void service_enter_reload(Service *s) {
         return;
 
 fail:
         return;
 
 fail:

-        log_warning("%s failed to run reload executable: %s", UNIT(s)->meta.id, strerror(-r));
+        log_warning("%s failed to run 'reload' task: %s", UNIT(s)->meta.id, strerror(-r));

         service_enter_stop(s, false);
 }
 
         service_enter_stop(s, false);
 }
 


@@ -1670,7 +1690,7 @@ static void service_run_next(Service *s, bool success) {
         return;
 
 fail:
         return;
 
 fail:

-        log_warning("%s failed to run spawn next executable: %s", UNIT(s)->meta.id, strerror(-r));
+        log_warning("%s failed to run spawn next task: %s", UNIT(s)->meta.id, strerror(-r));

 
         if (s->state == SERVICE_START_PRE)
                 service_enter_signal(s, SERVICE_FINAL_SIGTERM, false);
 
         if (s->state == SERVICE_START_PRE)
                 service_enter_signal(s, SERVICE_FINAL_SIGTERM, false);


@@ -1943,14 +1963,18 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) {
                         break;
 
                 case SERVICE_START:
                         break;
 
                 case SERVICE_START:

-                        assert(s->type == SERVICE_FINISH);
+                        if (s->type == SERVICE_FINISH) {
+                                /* This was our main goal, so let's go on */
+                                if (success)
+                                        service_enter_start_post(s);
+                                else
+                                        service_enter_signal(s, SERVICE_FINAL_SIGTERM, false);
+                                break;
+                        } else {
+                                assert(s->type == SERVICE_DBUS);

 
 

-                        /* This was our main goal, so let's go on */
-                        if (success)
-                                service_enter_start_post(s);
-                        else
-                                service_enter_signal(s, SERVICE_FINAL_SIGTERM, false);
-                        break;
+                                /* Fall through */
+                        }

 
                 case SERVICE_RUNNING:
                         service_enter_running(s, success);
 
                 case SERVICE_RUNNING:
                         service_enter_running(s, success);


@@ -2244,7 +2268,7 @@ static int service_enumerate(Manager *m) {
                                 }
 
                                 if (de->d_name[0] == 'S' &&
                                 }
 
                                 if (de->d_name[0] == 'S' &&

-                                    (rcnd_table[i].type == RUNLEVEL_UP || rcnd_table[i].type == RUNLEVEL_BASIC))
+                                    (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);
 
                                         SERVICE(service)->sysv_start_priority =
                                                 MAX(a*10 + b, SERVICE(service)->sysv_start_priority);
 


@@ -2263,7 +2287,9 @@ static int service_enumerate(Manager *m) {
                                         if ((r = unit_add_dependency(service, UNIT_BEFORE, runlevel_target, true)) < 0)
                                                 goto finish;
 
                                         if ((r = unit_add_dependency(service, UNIT_BEFORE, runlevel_target, true)) < 0)
                                                 goto finish;
 

-                                } else if (de->d_name[0] == 'K' && rcnd_table[i].type == RUNLEVEL_DOWN) {
+                                } else if (de->d_name[0] == 'K' &&
+                                           (rcnd_table[i].type == RUNLEVEL_DOWN ||
+                                            rcnd_table[i].type == RUNLEVEL_SYSINIT)) {

                                         Unit *shutdown_target;
 
                                         /* We honour K links only for
                                         Unit *shutdown_target;
 
                                         /* We honour K links only for


@@ -2275,7 +2301,12 @@ static int service_enumerate(Manager *m) {
                                          * really distuingish here
                                          * between the runlevels 0 and
                                          * 6 and just add them to the
                                          * really distuingish here
                                          * between the runlevels 0 and
                                          * 6 and just add them to the

-                                         * special shutdown target. */
+                                         * special shutdown target. On
+                                         * SUSE the boot.d/ runlevel
+                                         * is also used for shutdown,
+                                         * so we add links for that
+                                         * too to the shutdown
+                                         * target.*/

 
                                         if ((r = manager_load_unit(m, SPECIAL_SHUTDOWN_TARGET, NULL, &shutdown_target)) < 0)
                                                 goto finish;
 
                                         if ((r = manager_load_unit(m, SPECIAL_SHUTDOWN_TARGET, NULL, &shutdown_target)) < 0)
                                                 goto finish;