X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fservice.c;h=51a7e6b20f54eed85e0604bb9dee2297cc696f3d;hp=2f699cd1e66a582e9c7f0653594b6ce2c6d18a01;hb=980900c1d90b95e594ed0e49dcc11aa59ef14fd2;hpb=cfe243e3720062c2e0eecd8bb0bdd7b4059e156d diff --git a/src/service.c b/src/service.c index 2f699cd1e..51a7e6b20 100644 --- a/src/service.c +++ b/src/service.c @@ -1,4 +1,4 @@ -/*-*- Mode: C; c-basic-offset: 8 -*-*/ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ /*** This file is part of systemd. @@ -32,15 +32,16 @@ #include "strv.h" #include "unit-name.h" #include "dbus-service.h" +#include "special.h" +#include "bus-errors.h" #define COMMENTS "#;\n" #define NEWLINES "\n\r" -#define LINE_MAX 4096 typedef enum RunlevelType { RUNLEVEL_UP, RUNLEVEL_DOWN, - RUNLEVEL_BASIC + RUNLEVEL_SYSINIT } RunlevelType; static const struct { @@ -48,20 +49,32 @@ static const struct { const char *target; const RunlevelType type; } rcnd_table[] = { - /* Standard SysV runlevels */ - { "rc0.d", SPECIAL_RUNLEVEL0_TARGET, RUNLEVEL_DOWN }, - { "rc1.d", SPECIAL_RUNLEVEL1_TARGET, RUNLEVEL_UP }, + /* Standard SysV runlevels for start-up */ + { "rc1.d", SPECIAL_RESCUE_TARGET, RUNLEVEL_UP }, { "rc2.d", SPECIAL_RUNLEVEL2_TARGET, RUNLEVEL_UP }, { "rc3.d", SPECIAL_RUNLEVEL3_TARGET, RUNLEVEL_UP }, { "rc4.d", SPECIAL_RUNLEVEL4_TARGET, RUNLEVEL_UP }, { "rc5.d", SPECIAL_RUNLEVEL5_TARGET, RUNLEVEL_UP }, - { "rc6.d", SPECIAL_RUNLEVEL6_TARGET, RUNLEVEL_DOWN }, +#ifdef TARGET_SUSE /* SUSE style boot.d */ - { "boot.d", SPECIAL_BASIC_TARGET, RUNLEVEL_BASIC }, + { "boot.d", SPECIAL_SYSINIT_TARGET, RUNLEVEL_SYSINIT }, +#endif +#ifdef TARGET_DEBIAN /* Debian style rcS.d */ - { "rcS.d", SPECIAL_BASIC_TARGET, RUNLEVEL_BASIC }, + { "rcS.d", SPECIAL_SYSINIT_TARGET, RUNLEVEL_SYSINIT }, +#endif + + /* Standard SysV runlevels for shutdown */ + { "rc0.d", SPECIAL_POWEROFF_TARGET, RUNLEVEL_DOWN }, + { "rc6.d", SPECIAL_REBOOT_TARGET, RUNLEVEL_DOWN } + + /* Note that the order here matters, as we read the + directories in this order, and we want to make sure that + sysv_start_priority is known when we first load the + unit. And that value we only know from S links. Hence + UP/SYSINIT must be read before DOWN */ }; #define RUNLEVELS_UP "12345" @@ -75,15 +88,15 @@ static const UnitActiveState state_translation_table[_SERVICE_STATE_MAX] = { [SERVICE_START_POST] = UNIT_ACTIVATING, [SERVICE_RUNNING] = UNIT_ACTIVE, [SERVICE_EXITED] = UNIT_ACTIVE, - [SERVICE_RELOAD] = UNIT_ACTIVE_RELOADING, + [SERVICE_RELOAD] = UNIT_RELOADING, [SERVICE_STOP] = UNIT_DEACTIVATING, [SERVICE_STOP_SIGTERM] = UNIT_DEACTIVATING, [SERVICE_STOP_SIGKILL] = UNIT_DEACTIVATING, [SERVICE_STOP_POST] = UNIT_DEACTIVATING, [SERVICE_FINAL_SIGTERM] = UNIT_DEACTIVATING, [SERVICE_FINAL_SIGKILL] = UNIT_DEACTIVATING, - [SERVICE_MAINTAINANCE] = UNIT_INACTIVE, - [SERVICE_AUTO_RESTART] = UNIT_ACTIVATING, + [SERVICE_FAILED] = UNIT_FAILED, + [SERVICE_AUTO_RESTART] = UNIT_ACTIVATING }; static void service_init(Unit *u) { @@ -125,6 +138,29 @@ static void service_unwatch_main_pid(Service *s) { s->main_pid = 0; } +static int service_set_main_pid(Service *s, pid_t pid) { + pid_t ppid; + + assert(s); + + if (pid <= 1) + return -EINVAL; + + if (pid == getpid()) + return -EINVAL; + + if (get_parent_of_pid(pid, &ppid) >= 0 && ppid != getpid()) + log_warning("%s: Supervising process %lu which is not our child. We'll most likely not notice when it exits.", + s->meta.id, (unsigned long) pid); + + s->main_pid = pid; + s->main_pid_known = true; + + exec_status_start(&s->main_exec_status, pid); + + return 0; +} + static void service_close_socket_fd(Service *s) { assert(s); @@ -135,6 +171,16 @@ static void service_close_socket_fd(Service *s) { s->socket_fd = -1; } +static void service_connection_unref(Service *s) { + assert(s); + + if (!s->socket) + return; + + socket_connection_unref(s->socket); + s->socket = NULL; +} + static void service_done(Unit *u) { Service *s = SERVICE(u); @@ -149,6 +195,9 @@ static void service_done(Unit *u) { free(s->sysv_runlevels); s->sysv_runlevels = NULL; + free(s->status_text); + s->status_text = NULL; + exec_context_done(&s->exec_context); exec_command_free_array(s->exec_command, _SERVICE_EXEC_COMMAND_MAX); s->control_command = NULL; @@ -165,6 +214,7 @@ static void service_done(Unit *u) { } service_close_socket_fd(s); + service_connection_unref(s); unit_unwatch_timer(u, &s->timer_watch); } @@ -181,6 +231,11 @@ static char *sysv_translate_name(const char *name) { else if (endswith(name, ".sh")) /* Drop Debian-style .sh suffix */ strcpy(stpcpy(r, name) - 3, ".service"); +#ifdef TARGET_ARCH + else if (startswith(name, "@")) + /* Drop Arch-style background prefix */ + strcpy(stpcpy(r, name + 1), ".service"); +#endif else /* Normal init scripts */ strcpy(stpcpy(r, name), ".service"); @@ -191,13 +246,28 @@ static char *sysv_translate_name(const char *name) { 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, - "$time", SPECIAL_RTC_SET_TARGET + "$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, + +#ifdef TARGET_FEDORA + /* Fedora extensions, lacking the $ prefix */ + "MTA", SPECIAL_MAIL_TRANSFER_AGENT_TARGET, + "smtpdaemon", SPECIAL_MAIL_TRANSFER_AGENT_TARGET, + "httpd", SPECIAL_HTTP_DAEMON_TARGET, +#endif }; unsigned i; @@ -212,9 +282,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: @@ -237,9 +309,10 @@ static int sysv_fix_order(Service *s) { /* For each pair of services where at least one lacks a LSB * header, we use the start priority value to order things. */ - LIST_FOREACH(units_per_type, other, UNIT(s)->meta.manager->units_per_type[UNIT_SERVICE]) { + LIST_FOREACH(units_per_type, other, s->meta.manager->units_per_type[UNIT_SERVICE]) { Service *t; UnitDependency d; + bool special_s, special_t; t = (Service*) other; @@ -251,11 +324,18 @@ static int sysv_fix_order(Service *s) { /* If both units have modern headers we don't care * about the priorities */ - if ((!s->sysv_path || s->sysv_has_lsb) && - (!t->sysv_path || t->sysv_has_lsb)) + if ((s->meta.fragment_path || s->sysv_has_lsb) && + (t->meta.fragment_path || t->sysv_has_lsb)) continue; - if (t->sysv_start_priority < s->sysv_start_priority) + special_s = s->sysv_runlevels && !chars_intersect(RUNLEVELS_UP, s->sysv_runlevels); + special_t = t->sysv_runlevels && !chars_intersect(RUNLEVELS_UP, t->sysv_runlevels); + + if (special_t && !special_s) + d = UNIT_AFTER; + else if (special_s && !special_t) + d = UNIT_BEFORE; + else if (t->sysv_start_priority < s->sysv_start_priority) d = UNIT_AFTER; else if (t->sysv_start_priority > s->sysv_start_priority) d = UNIT_BEFORE; @@ -334,9 +414,6 @@ static int service_load_sysv_path(Service *s, const char *path) { goto finish; } - s->type = SERVICE_FORKING; - s->restart = SERVICE_ONCE; - free(s->sysv_path); if (!(s->sysv_path = strdup(path))) { r = -ENOMEM; @@ -379,7 +456,7 @@ static int service_load_sysv_path(Service *s, const char *path) { /* 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; @@ -416,7 +493,8 @@ static int service_load_sysv_path(Service *s, const char *path) { s->sysv_runlevels = d; } - } else if (startswith(t, "description:")) { + } else if (startswith_no_case(t, "description:") && + !u->meta.description) { size_t k = strlen(t); char *d; @@ -426,7 +504,7 @@ static int service_load_sysv_path(Service *s, const char *path) { t[k-1] = 0; } - if (!(d = strdup(strstrip(t+12)))) { + if (!(d = strappend("LSB: ", strstrip(t+12)))) { r = -ENOMEM; goto finish; } @@ -434,7 +512,7 @@ static int service_load_sysv_path(Service *s, const char *path) { free(u->meta.description); u->meta.description = d; - } else if (startswith(t, "pidfile:")) { + } else if (startswith_no_case(t, "pidfile:")) { char *fn; @@ -479,13 +557,13 @@ static int service_load_sysv_path(Service *s, const char *path) { } else if (state == LSB || state == LSB_DESCRIPTION) { - if (startswith(t, "Provides:")) { + if (startswith_no_case(t, "Provides:")) { char *i, *w; size_t z; state = LSB; - FOREACH_WORD(w, z, t+9, i) { + FOREACH_WORD_QUOTED(w, z, t+9, i) { char *n, *m; if (!(n = strndup(w, z))) { @@ -505,24 +583,32 @@ static int service_load_sysv_path(Service *s, const char *path) { if (unit_name_to_type(m) == UNIT_SERVICE) r = unit_add_name(u, m); else { - if ((r = unit_add_dependency_by_name_inverse(u, UNIT_REQUIRES, m, NULL, true)) >= 0) - r = unit_add_dependency_by_name(u, UNIT_BEFORE, m, NULL, true); - } + r = unit_add_dependency_by_name(u, UNIT_BEFORE, m, NULL, true); - free(m); + if (s->sysv_enabled) { + int k; + + if ((k = unit_add_dependency_by_name_inverse(u, UNIT_WANTS, m, NULL, true)) < 0) + r = k; + } + } 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(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; state = LSB; - FOREACH_WORD(w, z, strchr(t, ':')+1, i) { + FOREACH_WORD_QUOTED(w, z, strchr(t, ':')+1, i) { char *n, *m; if (!(n = strndup(w, z))) { @@ -539,13 +625,14 @@ static int service_load_sysv_path(Service *s, const char *path) { if (r == 0) continue; - r = unit_add_dependency_by_name(u, UNIT_AFTER, m, NULL, true); - free(m); + r = unit_add_dependency_by_name(u, startswith_no_case(t, "X-Start-Before:") ? UNIT_BEFORE : UNIT_AFTER, m, NULL, true); 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(t, "Default-Start:")) { + } else if (startswith_no_case(t, "Default-Start:")) { char *k, *d; state = LSB; @@ -562,12 +649,16 @@ static int service_load_sysv_path(Service *s, const char *path) { s->sysv_runlevels = d; } - } else if (startswith(t, "Description:")) { + } else if (startswith_no_case(t, "Description:") && + !u->meta.description) { char *d; + /* We use the long description only if + * no short description is set. */ + state = LSB_DESCRIPTION; - if (!(d = strdup(strstrip(t+12)))) { + if (!(d = strappend("LSB: ", strstrip(t+12)))) { r = -ENOMEM; goto finish; } @@ -575,22 +666,32 @@ static int service_load_sysv_path(Service *s, const char *path) { free(u->meta.description); u->meta.description = d; - } else if (startswith(t, "Short-Description:") && - !u->meta.description) { + } else if (startswith_no_case(t, "Short-Description:")) { char *d; - /* We use the short description only - * if no long description is set. */ - state = LSB; - if (!(d = strdup(strstrip(t+18)))) { + if (!(d = strappend("LSB: ", strstrip(t+18)))) { r = -ENOMEM; goto finish; } + free(u->meta.description); 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, "# ")) { @@ -613,24 +714,27 @@ static int service_load_sysv_path(Service *s, const char *path) { if ((r = sysv_exec_commands(s)) < 0) goto finish; - if (!s->sysv_runlevels || chars_intersect(RUNLEVELS_UP, s->sysv_runlevels)) { + if (s->sysv_runlevels && !chars_intersect(RUNLEVELS_UP, s->sysv_runlevels)) { /* If there a runlevels configured for this service * but none of the standard ones, then we assume this * is some special kind of service (which might be * needed for early boot) and don't create any links * to it. */ - if ((r = unit_add_dependency_by_name(u, UNIT_REQUIRES, SPECIAL_BASIC_TARGET, NULL, true)) < 0 || - (r = unit_add_dependency_by_name(u, UNIT_AFTER, SPECIAL_BASIC_TARGET, NULL, true)) < 0) - goto finish; + s->meta.default_dependencies = false; - } else /* Don't timeout special services during boot (like fsck) */ s->timeout_usec = 0; + } /* Special setting for all SysV services */ - s->valid_no_process = true; - s->kill_mode = KILL_PROCESS_GROUP; + s->type = SERVICE_FORKING; + s->remain_after_exit = true; + s->restart = SERVICE_ONCE; + s->exec_context.std_output = + (s->meta.manager->sysv_console || s->exec_context.std_input == EXEC_INPUT_TTY) + ? EXEC_OUTPUT_TTY : EXEC_OUTPUT_NULL; + s->exec_context.kill_mode = KILL_PROCESS_GROUP; u->meta.load_state = UNIT_LOADED; r = 0; @@ -655,7 +759,7 @@ static int service_load_sysv_name(Service *s, const char *name) { endswith(name, ".sh.service")) return -ENOENT; - STRV_FOREACH(p, UNIT(s)->meta.manager->sysvinit_path) { + STRV_FOREACH(p, s->meta.manager->lookup_paths.sysvinit_path) { char *path; int r; @@ -667,7 +771,7 @@ static int service_load_sysv_name(Service *s, const char *name) { r = service_load_sysv_path(s, path); - if (r >= 0 && UNIT(s)->meta.load_state == UNIT_STUB) { + if (r >= 0 && s->meta.load_state == UNIT_STUB) { /* Try Debian style xxx.sh source'able init scripts */ strcat(path, ".sh"); r = service_load_sysv_path(s, path); @@ -675,7 +779,7 @@ static int service_load_sysv_name(Service *s, const char *name) { free(path); - if (r >= 0 && UNIT(s)->meta.load_state == UNIT_STUB) { + if (r >= 0 && s->meta.load_state == UNIT_STUB) { /* Try SUSE style boot.xxx init scripts */ if (asprintf(&path, "%s/boot.%s", *p, name) < 0) @@ -689,7 +793,7 @@ static int service_load_sysv_name(Service *s, const char *name) { if (r < 0) return r; - if ((UNIT(s)->meta.load_state != UNIT_STUB)) + if ((s->meta.load_state != UNIT_STUB)) break; } @@ -706,63 +810,82 @@ static int service_load_sysv(Service *s) { /* Load service data from SysV init scripts, preferably with * LSB headers ... */ - if (strv_isempty(UNIT(s)->meta.manager->sysvinit_path)) + if (strv_isempty(s->meta.manager->lookup_paths.sysvinit_path)) return 0; - if ((t = UNIT(s)->meta.id)) + if ((t = s->meta.id)) if ((r = service_load_sysv_name(s, t)) < 0) return r; - if (UNIT(s)->meta.load_state == UNIT_STUB) - SET_FOREACH(t, UNIT(s)->meta.names, i) { - if (t == UNIT(s)->meta.id) + if (s->meta.load_state == UNIT_STUB) + SET_FOREACH(t, s->meta.names, i) { + if (t == s->meta.id) continue; - if ((r == service_load_sysv_name(s, t)) < 0) + if ((r = service_load_sysv_name(s, t)) < 0) return r; - if (UNIT(s)->meta.load_state != UNIT_STUB) + if (s->meta.load_state != UNIT_STUB) break; } 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); - if (UNIT(s)->meta.load_state != UNIT_LOADED) + if (s->meta.load_state != UNIT_LOADED) return 0; if (!s->exec_command[SERVICE_EXEC_START]) { - log_error("%s lacks ExecStart setting. Refusing.", UNIT(s)->meta.id); + log_error("%s lacks ExecStart setting. Refusing.", s->meta.id); + return -EINVAL; + } + + if (s->type != SERVICE_ONESHOT && + s->exec_command[SERVICE_EXEC_START]->command_next) { + log_error("%s has more than one ExecStart setting, which is only allowed for Type=oneshot services. Refusing.", s->meta.id); return -EINVAL; } if (s->type == SERVICE_DBUS && !s->bus_name) { - log_error("%s is of type D-Bus but no D-Bus service name has been specified. Refusing.", UNIT(s)->meta.id); + log_error("%s is of type D-Bus but no D-Bus service name has been specified. Refusing.", s->meta.id); + return -EINVAL; + } + + if (s->exec_context.pam_name && s->exec_context.kill_mode != KILL_CONTROL_GROUP) { + log_error("%s has PAM enabled. Kill mode must be set to 'control-group'. Refusing.", s->meta.id); return -EINVAL; } return 0; } +static int service_add_default_dependencies(Service *s) { + int r; + + assert(s); + + /* Add a number of automatic dependencies useful for the + * majority of services. */ + + /* First, pull in base system */ + if (s->meta.manager->running_as == MANAGER_SYSTEM) { + + if ((r = unit_add_two_dependencies_by_name(UNIT(s), UNIT_AFTER, UNIT_REQUIRES, SPECIAL_BASIC_TARGET, NULL, true)) < 0) + return r; + + } else if (s->meta.manager->running_as == MANAGER_SESSION) { + + if ((r = unit_add_two_dependencies_by_name(UNIT(s), UNIT_AFTER, UNIT_REQUIRES, SPECIAL_SOCKETS_TARGET, NULL, true)) < 0) + return r; + } + + /* Second, activate normal shutdown */ + return unit_add_two_dependencies_by_name(UNIT(s), UNIT_BEFORE, UNIT_CONFLICTED_BY, SPECIAL_SHUTDOWN_TARGET, NULL, true); +} + static int service_load(Unit *u) { int r; Service *s = SERVICE(u); @@ -798,13 +921,20 @@ 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) + if (s->bus_name) + if ((r = unit_watch_bus_name(u, s->bus_name)) < 0) return r; - 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; + + if (s->type == SERVICE_DBUS || s->bus_name) + if ((r = unit_add_two_dependencies_by_name(u, UNIT_AFTER, UNIT_REQUIRES, SPECIAL_DBUS_TARGET, NULL, true)) < 0) + return r; + + if (s->meta.default_dependencies) + if ((r = service_add_default_dependencies(s)) < 0) + return r; } return service_verify(s); @@ -826,25 +956,27 @@ static void service_dump(Unit *u, FILE *f, const char *prefix) { "%sService State: %s\n" "%sPermissionsStartOnly: %s\n" "%sRootDirectoryStartOnly: %s\n" - "%sValidNoProcess: %s\n" - "%sKillMode: %s\n" - "%sType: %s\n", + "%sRemainAfterExit: %s\n" + "%sType: %s\n" + "%sRestart: %s\n" + "%sNotifyAccess: %s\n", prefix, service_state_to_string(s->state), prefix, yes_no(s->permissions_start_only), prefix, yes_no(s->root_directory_start_only), - prefix, yes_no(s->valid_no_process), - prefix, kill_mode_to_string(s->kill_mode), - prefix, service_type_to_string(s->type)); + prefix, yes_no(s->remain_after_exit), + prefix, service_type_to_string(s->type), + prefix, service_restart_to_string(s->restart), + prefix, notify_access_to_string(s->notify_access)); if (s->control_pid > 0) fprintf(f, - "%sControl PID: %llu\n", - prefix, (unsigned long long) s->control_pid); + "%sControl PID: %lu\n", + prefix, (unsigned long) s->control_pid); if (s->main_pid > 0) fprintf(f, - "%sMain PID: %llu\n", - prefix, (unsigned long long) s->main_pid); + "%sMain PID: %lu\n", + prefix, (unsigned long) s->main_pid); if (s->pid_file) fprintf(f, @@ -880,20 +1012,26 @@ static void service_dump(Unit *u, FILE *f, const char *prefix) { if (s->sysv_start_priority >= 0) fprintf(f, - "%sSysVStartPriority: %i\n", - prefix, s->sysv_start_priority); + "%sSysVStartPriority: %i\n" + "%sSysVEnabled: %s\n", + prefix, s->sysv_start_priority, + prefix, yes_no(s->sysv_enabled)); if (s->sysv_runlevels) fprintf(f, "%sSysVRunLevels: %s\n", prefix, s->sysv_runlevels); + if (s->status_text) + fprintf(f, "%sStatus Text: %s\n", + prefix, s->status_text); + free(p2); } static int service_load_pid_file(Service *s) { char *k; - unsigned long p; int r; + pid_t pid; assert(s); @@ -908,26 +1046,24 @@ static int service_load_pid_file(Service *s) { if ((r = read_one_line_file(s->pid_file, &k)) < 0) return r; - if ((r = safe_atolu(k, &p)) < 0) { - free(k); - return r; - } + r = parse_pid(k, &pid); + free(k); - if ((unsigned long) (pid_t) p != p) - return -ERANGE; + if (r < 0) + return r; - if (kill((pid_t) p, 0) < 0 && errno != EPERM) { - log_warning("PID %llu read from file %s does not exist. Your service or init script might be broken.", - (unsigned long long) p, s->pid_file); + if (kill(pid, 0) < 0 && errno != EPERM) { + log_warning("PID %lu read from file %s does not exist. Your service or init script might be broken.", + (unsigned long) pid, s->pid_file); return -ESRCH; } - if ((r = unit_watch_pid(UNIT(s), (pid_t) p)) < 0) - /* FIXME: we need to do something here */ + if ((r = service_set_main_pid(s, pid)) < 0) return r; - s->main_pid = (pid_t) p; - s->main_pid_known = true; + if ((r = unit_watch_pid(UNIT(s), pid)) < 0) + /* FIXME: we need to do something here */ + return r; return 0; } @@ -941,6 +1077,9 @@ static int service_get_sockets(Service *s, Set **_set) { assert(s); assert(_set); + if (s->socket_fd >= 0) + return 0; + /* Collects all Socket objects that belong to this * service. Note that a service might have multiple sockets * via multiple names. */ @@ -948,7 +1087,7 @@ static int service_get_sockets(Service *s, Set **_set) { if (!(set = set_new(NULL, NULL))) return -ENOMEM; - SET_FOREACH(t, UNIT(s)->meta.names, i) { + SET_FOREACH(t, s->meta.names, i) { char *k; Unit *p; @@ -960,7 +1099,7 @@ static int service_get_sockets(Service *s, Set **_set) { goto fail; } - p = manager_get_unit(UNIT(s)->meta.manager, k); + p = manager_get_unit(s->meta.manager, k); free(k); if (!p) @@ -986,6 +1125,9 @@ static int service_notify_sockets_dead(Service *s) { assert(s); + if (s->socket_fd >= 0) + return 0; + /* Notifies all our sockets when we die */ if ((r = service_get_sockets(s, &set)) < 0) return r; @@ -1049,17 +1191,33 @@ static void service_set_state(Service *s, ServiceState state) { state == SERVICE_STOP_POST || state == SERVICE_FINAL_SIGTERM || state == SERVICE_FINAL_SIGKILL || - state == SERVICE_MAINTAINANCE || + state == SERVICE_FAILED || state == SERVICE_AUTO_RESTART) service_notify_sockets_dead(s); if (state != SERVICE_START_PRE && state != SERVICE_START && - !(state == SERVICE_DEAD && UNIT(s)->meta.job)) + state != SERVICE_START_POST && + state != SERVICE_RUNNING && + state != SERVICE_RELOAD && + state != SERVICE_STOP && + state != SERVICE_STOP_SIGTERM && + state != SERVICE_STOP_SIGKILL && + state != SERVICE_STOP_POST && + state != SERVICE_FINAL_SIGTERM && + state != SERVICE_FINAL_SIGKILL && + !(state == SERVICE_DEAD && s->meta.job)) { service_close_socket_fd(s); + service_connection_unref(s); + } + + /* For the inactive states unit_notify() will trim the cgroup, + * but for exit we have to do that ourselves... */ + if (state == SERVICE_EXITED) + cgroup_bonding_trim_list(s->meta.cgroup_bondings, true); if (old_state != state) - log_debug("%s changed %s -> %s", UNIT(s)->meta.id, service_state_to_string(old_state), service_state_to_string(state)); + log_debug("%s changed %s -> %s", s->meta.id, service_state_to_string(old_state), service_state_to_string(state)); unit_notify(UNIT(s), state_translation_table[old_state], state_translation_table[state]); } @@ -1097,7 +1255,9 @@ static int service_coldplug(Unit *u) { if ((s->deserialized_state == SERVICE_START && (s->type == SERVICE_FORKING || - s->type == SERVICE_DBUS)) || + s->type == SERVICE_DBUS || + s->type == SERVICE_ONESHOT || + s->type == SERVICE_NOTIFY)) || s->deserialized_state == SERVICE_START_POST || s->deserialized_state == SERVICE_RUNNING || s->deserialized_state == SERVICE_RELOAD || @@ -1140,6 +1300,9 @@ static int service_collect_fds(Service *s, int **fds, unsigned *n_fds) { assert(fds); assert(n_fds); + if (s->socket_fd >= 0) + return 0; + if ((r = service_get_sockets(s, &set)) < 0) return r; @@ -1196,24 +1359,34 @@ static int service_spawn( bool pass_fds, bool apply_permissions, bool apply_chroot, + bool apply_tty_stdin, + bool set_notify_socket, pid_t *_pid) { pid_t pid; int r; - int *fds = NULL; - unsigned n_fds = 0; - char **argv; + int *fds = NULL, *fdsbuf = NULL; + unsigned n_fds = 0, n_env = 0; + char **argv = NULL, **final_env = NULL, **our_env = NULL; assert(s); assert(c); assert(_pid); - if (pass_fds) { + if (pass_fds || + s->exec_context.std_input == EXEC_INPUT_SOCKET || + s->exec_context.std_output == EXEC_OUTPUT_SOCKET || + s->exec_context.std_error == EXEC_OUTPUT_SOCKET) { + if (s->socket_fd >= 0) { fds = &s->socket_fd; n_fds = 1; - } else if ((r = service_collect_fds(s, &fds, &n_fds)) < 0) - goto fail; + } else { + if ((r = service_collect_fds(s, &fdsbuf, &n_fds)) < 0) + goto fail; + + fds = fdsbuf; + } } if (timeout && s->timeout_usec) { @@ -1227,38 +1400,65 @@ static int service_spawn( goto fail; } + if (!(our_env = new0(char*, 3))) { + r = -ENOMEM; + goto fail; + } + + if (set_notify_socket) + if (asprintf(our_env + n_env++, "NOTIFY_SOCKET=@%s", s->meta.manager->notify_socket) < 0) { + r = -ENOMEM; + goto fail; + } + + if (s->main_pid > 0) + if (asprintf(our_env + n_env++, "MAINPID=%lu", (unsigned long) s->main_pid) < 0) { + r = -ENOMEM; + goto fail; + } + + if (!(final_env = strv_env_merge(2, + s->meta.manager->environment, + our_env, + NULL))) { + r = -ENOMEM; + goto fail; + } + r = exec_spawn(c, argv, &s->exec_context, fds, n_fds, - s->meta.manager->environment, + final_env, apply_permissions, apply_chroot, - UNIT(s)->meta.manager->confirm_spawn, - UNIT(s)->meta.cgroup_bondings, + apply_tty_stdin, + s->meta.manager->confirm_spawn, + s->meta.cgroup_bondings, &pid); - strv_free(argv); if (r < 0) goto fail; - if (fds) { - if (s->socket_fd >= 0) - service_close_socket_fd(s); - else - free(fds); - } if ((r = unit_watch_pid(UNIT(s), pid)) < 0) /* FIXME: we need to do something here */ goto fail; + free(fdsbuf); + strv_free(argv); + strv_free(our_env); + strv_free(final_env); + *_pid = pid; return 0; fail: - free(fds); + free(fdsbuf); + strv_free(argv); + strv_free(our_env); + strv_free(final_env); if (timeout) unit_unwatch_timer(UNIT(s), &s->timer_watch); @@ -1292,10 +1492,7 @@ static int cgroup_good(Service *s) { assert(s); - if (s->valid_no_process) - return -EAGAIN; - - if ((r = cgroup_bonding_is_empty_list(UNIT(s)->meta.cgroup_bondings)) < 0) + if ((r = cgroup_bonding_is_empty_list(s->meta.cgroup_bondings)) < 0) return r; return !r; @@ -1309,7 +1506,7 @@ static void service_enter_dead(Service *s, bool success, bool allow_restart) { s->failure = true; if (allow_restart && - s->allow_restart && + !s->forbid_restart && (s->restart == SERVICE_RESTART_ALWAYS || (s->restart == SERVICE_RESTART_ON_SUCCESS && !s->failure))) { @@ -1318,12 +1515,14 @@ static void service_enter_dead(Service *s, bool success, bool allow_restart) { service_set_state(s, SERVICE_AUTO_RESTART); } else - service_set_state(s, s->failure ? SERVICE_MAINTAINANCE : SERVICE_DEAD); + service_set_state(s, s->failure ? SERVICE_FAILED : SERVICE_DEAD); + + s->forbid_restart = false; return; fail: - log_warning("%s failed to run install restart timer: %s", UNIT(s)->meta.id, strerror(-r)); + log_warning("%s failed to run install restart timer: %s", s->meta.id, strerror(-r)); service_enter_dead(s, false, false); } @@ -1346,6 +1545,8 @@ static void service_enter_stop_post(Service *s, bool success) { false, !s->permissions_start_only, !s->root_directory_start_only, + true, + false, &s->control_pid)) < 0) goto fail; @@ -1357,54 +1558,70 @@ static void service_enter_stop_post(Service *s, bool success) { 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", s->meta.id, strerror(-r)); service_enter_signal(s, SERVICE_FINAL_SIGTERM, false); } static void service_enter_signal(Service *s, ServiceState state, bool success) { int r; - bool sent = false; + Set *pid_set = NULL; + bool wait_for_exit = false; assert(s); if (!success) s->failure = true; - if (s->kill_mode != KILL_NONE) { - int sig = (state == SERVICE_STOP_SIGTERM || state == SERVICE_FINAL_SIGTERM) ? SIGTERM : SIGKILL; + if (s->exec_context.kill_mode != KILL_NONE) { + int sig = (state == SERVICE_STOP_SIGTERM || state == SERVICE_FINAL_SIGTERM) ? s->exec_context.kill_signal : SIGKILL; - if (s->kill_mode == KILL_CONTROL_GROUP) { + if (s->main_pid > 0) { + if (kill(s->exec_context.kill_mode == KILL_PROCESS_GROUP ? + -s->main_pid : + s->main_pid, sig) < 0 && errno != ESRCH) - if ((r = cgroup_bonding_kill_list(UNIT(s)->meta.cgroup_bondings, sig)) < 0) { - if (r != -EAGAIN && r != -ESRCH) - goto fail; - } else - sent = true; + log_warning("Failed to kill main process %li: %m", (long) s->main_pid); + else + wait_for_exit = true; } - if (!sent) { - r = 0; + if (s->control_pid > 0) { + if (kill(s->exec_context.kill_mode == KILL_PROCESS_GROUP ? + -s->control_pid : + s->control_pid, sig) < 0 && errno != ESRCH) - if (s->main_pid > 0) { - if (kill(s->kill_mode == KILL_PROCESS ? s->main_pid : -s->main_pid, sig) < 0 && errno != ESRCH) - r = -errno; - else - sent = true; - } + log_warning("Failed to kill control process %li: %m", (long) s->control_pid); + else + wait_for_exit = true; + } - if (s->control_pid > 0) { - if (kill(s->kill_mode == KILL_PROCESS ? s->control_pid : -s->control_pid, sig) < 0 && errno != ESRCH) - r = -errno; - else - sent = true; - } + if (s->exec_context.kill_mode == KILL_CONTROL_GROUP) { - if (r < 0) + if (!(pid_set = set_new(trivial_hash_func, trivial_compare_func))) { + r = -ENOMEM; goto fail; + } + + /* Exclude the main/control pids from being killed via the cgroup */ + if (s->main_pid > 0) + if ((r = set_put(pid_set, LONG_TO_PTR(s->main_pid))) < 0) + goto fail; + + if (s->control_pid > 0) + if ((r = set_put(pid_set, LONG_TO_PTR(s->control_pid))) < 0) + goto fail; + + if ((r = cgroup_bonding_kill_list(s->meta.cgroup_bondings, sig, pid_set)) < 0) { + if (r != -EAGAIN && r != -ESRCH && r != -ENOENT) + log_warning("Failed to kill control group: %s", strerror(-r)); + } else if (r > 0) + wait_for_exit = true; + + set_free(pid_set); } } - if (sent && (s->main_pid > 0 || s->control_pid > 0)) { + if (wait_for_exit) { if (s->timeout_usec > 0) if ((r = unit_watch_timer(UNIT(s), s->timeout_usec, &s->timer_watch)) < 0) goto fail; @@ -1418,16 +1635,20 @@ static void service_enter_signal(Service *s, ServiceState state, bool success) { return; fail: - log_warning("%s failed to kill processes: %s", UNIT(s)->meta.id, strerror(-r)); + log_warning("%s failed to kill processes: %s", s->meta.id, strerror(-r)); if (state == SERVICE_STOP_SIGTERM || state == SERVICE_STOP_SIGKILL) service_enter_stop_post(s, false); else service_enter_dead(s, false, true); + + if (pid_set) + set_free(pid_set); } static void service_enter_stop(Service *s, bool success) { int r; + assert(s); if (!success) @@ -1443,6 +1664,8 @@ static void service_enter_stop(Service *s, bool success) { false, !s->permissions_start_only, !s->root_directory_start_only, + false, + false, &s->control_pid)) < 0) goto fail; @@ -1453,21 +1676,24 @@ static void service_enter_stop(Service *s, bool success) { 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", s->meta.id, strerror(-r)); service_enter_signal(s, SERVICE_STOP_SIGTERM, false); } static void service_enter_running(Service *s, bool success) { + int main_pid_ok, cgroup_ok; assert(s); if (!success) s->failure = true; - if (main_pid_good(s) != 0 && - cgroup_good(s) != 0 && + main_pid_ok = main_pid_good(s); + cgroup_ok = cgroup_good(s); + + if ((main_pid_ok > 0 || (main_pid_ok < 0 && cgroup_ok != 0)) && (s->bus_name_good || s->type != SERVICE_DBUS)) service_set_state(s, SERVICE_RUNNING); - else if (s->valid_no_process) + else if (s->remain_after_exit) service_set_state(s, SERVICE_EXITED); else service_enter_stop(s, true); @@ -1487,10 +1713,11 @@ static void service_enter_start_post(Service *s) { false, !s->permissions_start_only, !s->root_directory_start_only, + false, + false, &s->control_pid)) < 0) goto fail; - service_set_state(s, SERVICE_START_POST); } else service_enter_running(s, true); @@ -1498,7 +1725,7 @@ static void service_enter_start_post(Service *s) { 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", s->meta.id, strerror(-r)); service_enter_stop(s, false); } @@ -1509,19 +1736,24 @@ static void service_enter_start(Service *s) { assert(s); assert(s->exec_command[SERVICE_EXEC_START]); - assert(!s->exec_command[SERVICE_EXEC_START]->command_next); + assert(!s->exec_command[SERVICE_EXEC_START]->command_next || s->type == SERVICE_ONESHOT); if (s->type == SERVICE_FORKING) service_unwatch_control_pid(s); else service_unwatch_main_pid(s); + s->control_command_id = SERVICE_EXEC_START; + s->control_command = s->exec_command[SERVICE_EXEC_START]; + if ((r = service_spawn(s, - s->exec_command[SERVICE_EXEC_START], - s->type == SERVICE_FORKING || s->type == SERVICE_DBUS, + s->control_command, + s->type == SERVICE_FORKING || s->type == SERVICE_DBUS || s->type == SERVICE_NOTIFY, true, true, true, + true, + s->notify_access != NOTIFY_NONE, &pid)) < 0) goto fail; @@ -1529,9 +1761,7 @@ static void service_enter_start(Service *s) { /* For simple services we immediately start * the START_POST binaries. */ - s->main_pid = pid; - s->main_pid_known = true; - + service_set_main_pid(s, pid); service_enter_start_post(s); } else if (s->type == SERVICE_FORKING) { @@ -1540,23 +1770,20 @@ static void service_enter_start(Service *s) { * process exited. */ s->control_pid = pid; - - s->control_command_id = SERVICE_EXEC_START; - s->control_command = s->exec_command[SERVICE_EXEC_START]; service_set_state(s, SERVICE_START); - } else if (s->type == SERVICE_FINISH || - s->type == SERVICE_DBUS) { + } else if (s->type == SERVICE_ONESHOT || + s->type == SERVICE_DBUS || + s->type == SERVICE_NOTIFY) { - /* For finishing services we wait until the start + /* For oneshot services we wait until the start * process exited, too, but it is our main process. */ /* For D-Bus services we know the main pid right away, - * but wait for the bus name to appear on the bus. */ - - s->main_pid = pid; - s->main_pid_known = true; + * but wait for the bus name to appear on the + * bus. Notify services are similar. */ + service_set_main_pid(s, pid); service_set_state(s, SERVICE_START); } else assert_not_reached("Unknown service type"); @@ -1564,7 +1791,7 @@ static void service_enter_start(Service *s) { 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", s->meta.id, strerror(-r)); service_enter_signal(s, SERVICE_FINAL_SIGTERM, false); } @@ -1583,6 +1810,8 @@ static void service_enter_start_pre(Service *s) { false, !s->permissions_start_only, !s->root_directory_start_only, + true, + false, &s->control_pid)) < 0) goto fail; @@ -1593,26 +1822,30 @@ static void service_enter_start_pre(Service *s) { 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", s->meta.id, strerror(-r)); service_enter_dead(s, false, true); } static void service_enter_restart(Service *s) { int r; + DBusError error; + assert(s); + dbus_error_init(&error); service_enter_dead(s, true, false); - if ((r = manager_add_job(UNIT(s)->meta.manager, JOB_START, UNIT(s), JOB_FAIL, false, NULL)) < 0) + if ((r = manager_add_job(s->meta.manager, JOB_START, UNIT(s), JOB_FAIL, false, &error, NULL)) < 0) goto fail; - log_debug("%s scheduled restart job.", UNIT(s)->meta.id); + log_debug("%s scheduled restart job.", s->meta.id); return; fail: - - log_warning("%s failed to schedule restart job: %s", UNIT(s)->meta.id, strerror(-r)); + log_warning("%s failed to schedule restart job: %s", s->meta.id, bus_error(&error, -r)); service_enter_dead(s, false, false); + + dbus_error_free(&error); } static void service_enter_reload(Service *s) { @@ -1630,6 +1863,8 @@ static void service_enter_reload(Service *s) { false, !s->permissions_start_only, !s->root_directory_start_only, + false, + false, &s->control_pid)) < 0) goto fail; @@ -1640,11 +1875,11 @@ static void service_enter_reload(Service *s) { 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", s->meta.id, strerror(-r)); service_enter_stop(s, false); } -static void service_run_next(Service *s, bool success) { +static void service_run_next_control(Service *s, bool success) { int r; assert(s); @@ -1654,8 +1889,9 @@ static void service_run_next(Service *s, bool success) { if (!success) s->failure = true; - s->control_command = s->control_command->command_next; + assert(s->control_command_id != SERVICE_EXEC_START); + s->control_command = s->control_command->command_next; service_unwatch_control_pid(s); if ((r = service_spawn(s, @@ -1664,13 +1900,16 @@ static void service_run_next(Service *s, bool success) { false, !s->permissions_start_only, !s->root_directory_start_only, + s->control_command_id == SERVICE_EXEC_START_PRE || + s->control_command_id == SERVICE_EXEC_STOP_POST, + false, &s->control_pid)) < 0) goto 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 next control task: %s", s->meta.id, strerror(-r)); if (s->state == SERVICE_START_PRE) service_enter_signal(s, SERVICE_FINAL_SIGTERM, false); @@ -1682,6 +1921,43 @@ fail: service_enter_stop(s, false); } +static void service_run_next_main(Service *s, bool success) { + pid_t pid; + int r; + + assert(s); + assert(s->control_command); + assert(s->control_command->command_next); + + if (!success) + s->failure = true; + + assert(s->control_command_id == SERVICE_EXEC_START); + assert(s->type == SERVICE_ONESHOT); + + s->control_command = s->control_command->command_next; + service_unwatch_main_pid(s); + + if ((r = service_spawn(s, + s->control_command, + false, + true, + true, + true, + true, + s->notify_access != NOTIFY_NONE, + &pid)) < 0) + goto fail; + + service_set_main_pid(s, pid); + + return; + +fail: + log_warning("%s failed to run next main task: %s", s->meta.id, strerror(-r)); + service_enter_stop(s, false); +} + static int service_start(Unit *u) { Service *s = SERVICE(u); @@ -1703,7 +1979,7 @@ static int service_start(Unit *u) { s->state == SERVICE_START_POST) return 0; - assert(s->state == SERVICE_DEAD || s->state == SERVICE_MAINTAINANCE || s->state == SERVICE_AUTO_RESTART); + assert(s->state == SERVICE_DEAD || s->state == SERVICE_FAILED || s->state == SERVICE_AUTO_RESTART); /* Make sure we don't enter a busy loop of some kind. */ if (!ratelimit_test(&s->ratelimit)) { @@ -1711,9 +1987,17 @@ static int service_start(Unit *u) { return -ECANCELED; } + if ((s->exec_context.std_input == EXEC_INPUT_SOCKET || + s->exec_context.std_output == EXEC_OUTPUT_SOCKET || + s->exec_context.std_error == EXEC_OUTPUT_SOCKET) && + s->socket_fd < 0) { + log_warning("%s can only be started with a per-connection socket.", u->meta.id); + return -EINVAL; + } + s->failure = false; s->main_pid_known = false; - s->allow_restart = true; + s->forbid_restart = false; service_enter_start_pre(s); return 0; @@ -1724,12 +2008,9 @@ static int service_stop(Unit *u) { assert(s); - /* Cannot do this now */ - if (s->state == SERVICE_START_PRE || - s->state == SERVICE_START || - s->state == SERVICE_START_POST || - s->state == SERVICE_RELOAD) - return -EAGAIN; + /* This is a user request, so don't do restarts on this + * shutdown. */ + s->forbid_restart = true; /* Already on it */ if (s->state == SERVICE_STOP || @@ -1740,16 +2021,24 @@ static int service_stop(Unit *u) { s->state == SERVICE_FINAL_SIGKILL) return 0; + /* Don't allow a restart */ if (s->state == SERVICE_AUTO_RESTART) { service_set_state(s, SERVICE_DEAD); return 0; } - assert(s->state == SERVICE_RUNNING || s->state == SERVICE_EXITED); + /* If there's already something running we go directly into + * kill mode. */ + if (s->state == SERVICE_START_PRE || + s->state == SERVICE_START || + s->state == SERVICE_START_POST || + s->state == SERVICE_RELOAD) { + service_enter_signal(s, SERVICE_STOP_SIGTERM, true); + return 0; + } - /* This is a user request, so don't do restarts on this - * shutdown. */ - s->allow_restart = false; + assert(s->state == SERVICE_RUNNING || + s->state == SERVICE_EXITED); service_enter_stop(s, true); return 0; @@ -1785,13 +2074,16 @@ static int service_serialize(Unit *u, FILE *f, FDSet *fds) { unit_serialize_item(u, f, "failure", yes_no(s->failure)); if (s->control_pid > 0) - unit_serialize_item_format(u, f, "control-pid", "%u", (unsigned) (s->control_pid)); + unit_serialize_item_format(u, f, "control-pid", "%lu", (unsigned long) s->control_pid); - if (s->main_pid > 0) - unit_serialize_item_format(u, f, "main-pid", "%u", (unsigned) (s->main_pid)); + if (s->main_pid_known && s->main_pid > 0) + unit_serialize_item_format(u, f, "main-pid", "%lu", (unsigned long) s->main_pid); unit_serialize_item(u, f, "main-pid-known", yes_no(s->main_pid_known)); + if (s->status_text) + unit_serialize_item(u, f, "status-text", s->status_text); + /* There's a minor uncleanliness here: if there are multiple * commands attached here, we will start from the first one * again */ @@ -1807,12 +2099,33 @@ static int service_serialize(Unit *u, FILE *f, FDSet *fds) { unit_serialize_item_format(u, f, "socket-fd", "%i", copy); } + if (s->main_exec_status.pid > 0) { + unit_serialize_item_format(u, f, "main-exec-status-pid", "%lu", (unsigned long) s->main_exec_status.pid); + + if (s->main_exec_status.start_timestamp.realtime > 0) { + unit_serialize_item_format(u, f, "main-exec-status-start-realtime", + "%llu", (unsigned long long) s->main_exec_status.start_timestamp.realtime); + + unit_serialize_item_format(u, f, "main-exec-status-start-monotonic", + "%llu", (unsigned long long) s->main_exec_status.start_timestamp.monotonic); + } + + if (s->main_exec_status.exit_timestamp.realtime > 0) { + unit_serialize_item_format(u, f, "main-exec-status-exit-realtime", + "%llu", (unsigned long long) s->main_exec_status.exit_timestamp.realtime); + unit_serialize_item_format(u, f, "main-exec-status-exit-monotonic", + "%llu", (unsigned long long) s->main_exec_status.exit_timestamp.monotonic); + + unit_serialize_item_format(u, f, "main-exec-status-code", "%i", s->main_exec_status.code); + unit_serialize_item_format(u, f, "main-exec-status-status", "%i", s->main_exec_status.status); + } + } + return 0; } static int service_deserialize_item(Unit *u, const char *key, const char *value, FDSet *fds) { Service *s = SERVICE(u); - int r; assert(u); assert(key); @@ -1834,19 +2147,19 @@ static int service_deserialize_item(Unit *u, const char *key, const char *value, else s->failure = b || s->failure; } else if (streq(key, "control-pid")) { - unsigned pid; + pid_t pid; - if ((r = safe_atou(value, &pid)) < 0 || pid <= 0) + if (parse_pid(value, &pid) < 0) log_debug("Failed to parse control-pid value %s", value); else - s->control_pid = (pid_t) pid; + s->control_pid = pid; } else if (streq(key, "main-pid")) { - unsigned pid; + pid_t pid; - if ((r = safe_atou(value, &pid)) < 0 || pid <= 0) + if (parse_pid(value, &pid) < 0) log_debug("Failed to parse main-pid value %s", value); else - s->main_pid = (pid_t) pid; + service_set_main_pid(s, (pid_t) pid); } else if (streq(key, "main-pid-known")) { int b; @@ -1854,6 +2167,14 @@ static int service_deserialize_item(Unit *u, const char *key, const char *value, log_debug("Failed to parse main-pid-known value %s", value); else s->main_pid_known = b; + } else if (streq(key, "status-text")) { + char *t; + + if ((t = strdup(value))) { + free(s->status_text); + s->status_text = t; + } + } else if (streq(key, "control-command")) { ServiceExecCommand id; @@ -1874,6 +2195,55 @@ static int service_deserialize_item(Unit *u, const char *key, const char *value, close_nointr_nofail(s->socket_fd); s->socket_fd = fdset_remove(fds, fd); } + } else if (streq(key, "main-exec-status-pid")) { + pid_t pid; + + if (parse_pid(value, &pid) < 0) + log_debug("Failed to parse main-exec-status-pid value %s", value); + else + s->main_exec_status.pid = pid; + } else if (streq(key, "main-exec-status-code")) { + int i; + + if (safe_atoi(value, &i) < 0) + log_debug("Failed to parse main-exec-status-code value %s", value); + else + s->main_exec_status.code = i; + } else if (streq(key, "main-exec-status-status")) { + int i; + + if (safe_atoi(value, &i) < 0) + log_debug("Failed to parse main-exec-status-status value %s", value); + else + s->main_exec_status.status = i; + } else if (streq(key, "main-exec-status-start-realtime")) { + uint64_t k; + + if (safe_atou64(value, &k) < 0) + log_debug("Failed to parse main-exec-status-start-realtime value %s", value); + else + s->main_exec_status.start_timestamp.realtime = (usec_t) k; + } else if (streq(key, "main-exec-status-start-monotonic")) { + uint64_t k; + + if (safe_atou64(value, &k) < 0) + log_debug("Failed to parse main-exec-status-start-monotonic value %s", value); + else + s->main_exec_status.start_timestamp.monotonic = (usec_t) k; + } else if (streq(key, "main-exec-status-exit-realtime")) { + uint64_t k; + + if (safe_atou64(value, &k) < 0) + log_debug("Failed to parse main-exec-status-exit-realtime value %s", value); + else + s->main_exec_status.exit_timestamp.realtime = (usec_t) k; + } else if (streq(key, "main-exec-status-exit-monotonic")) { + uint64_t k; + + if (safe_atou64(value, &k) < 0) + log_debug("Failed to parse main-exec-status-exit-monotonic value %s", value); + else + s->main_exec_status.exit_timestamp.monotonic = (usec_t) k; } else log_debug("Unknown serialization key '%s'", key); @@ -1915,79 +2285,110 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) { assert(s); assert(pid >= 0); - success = is_clean_exit(code, status); - s->failure = s->failure || !success; + if (!s->meta.fragment_path) + success = is_clean_exit_lsb(code, status); + else + success = is_clean_exit(code, status); if (s->main_pid == pid) { - exec_status_fill(&s->main_exec_status, pid, code, status); s->main_pid = 0; + exec_status_exit(&s->main_exec_status, pid, code, status); - if (s->type == SERVICE_SIMPLE || s->type == SERVICE_FINISH) { - assert(s->exec_command[SERVICE_EXEC_START]); - s->exec_command[SERVICE_EXEC_START]->exec_status = s->main_exec_status; + if (s->type != SERVICE_FORKING && s->control_command) { + s->control_command->exec_status = s->main_exec_status; + + if (s->control_command->ignore) + success = true; } - log_debug("%s: main process exited, code=%s, status=%i", u->meta.id, sigchld_code_to_string(code), status); + log_full(success ? LOG_DEBUG : LOG_NOTICE, + "%s: main process exited, code=%s, status=%i", u->meta.id, sigchld_code_to_string(code), status); + s->failure = s->failure || !success; - /* The service exited, so the service is officially - * gone. */ + if (s->control_command && + s->control_command->command_next && + success) { - switch (s->state) { + /* There is another command to * + * execute, so let's do that. */ - case SERVICE_START_POST: - case SERVICE_RELOAD: - case SERVICE_STOP: - /* Need to wait until the operation is - * done */ - break; + log_debug("%s running next main command for state %s", u->meta.id, service_state_to_string(s->state)); + service_run_next_main(s, success); - case SERVICE_START: - assert(s->type == SERVICE_FINISH); + } else { - /* 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; + /* The service exited, so the service is officially + * gone. */ - case SERVICE_RUNNING: - service_enter_running(s, success); - break; + s->control_command = NULL; + s->control_command_id = _SERVICE_EXEC_COMMAND_INVALID; - case SERVICE_STOP_SIGTERM: - case SERVICE_STOP_SIGKILL: + switch (s->state) { - if (!control_pid_good(s)) - service_enter_stop_post(s, success); + case SERVICE_START_POST: + case SERVICE_RELOAD: + case SERVICE_STOP: + /* Need to wait until the operation is + * done */ + break; - /* If there is still a control process, wait for that first */ - break; + case SERVICE_START: + if (s->type == SERVICE_ONESHOT) { + /* 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 || s->type == SERVICE_NOTIFY); + + /* Fall through */ + } + + case SERVICE_RUNNING: + service_enter_running(s, success); + break; + + case SERVICE_STOP_SIGTERM: + case SERVICE_STOP_SIGKILL: + + if (!control_pid_good(s)) + service_enter_stop_post(s, success); - default: - assert_not_reached("Uh, main process died at wrong time."); + /* If there is still a control process, wait for that first */ + break; + + default: + assert_not_reached("Uh, main process died at wrong time."); + } } } else if (s->control_pid == pid) { - if (s->control_command) - exec_status_fill(&s->control_command->exec_status, pid, code, status); - s->control_pid = 0; - log_debug("%s: control process exited, code=%s status=%i", u->meta.id, sigchld_code_to_string(code), status); + if (s->control_command) { + exec_status_exit(&s->control_command->exec_status, pid, code, status); + + if (s->control_command->ignore) + success = true; + } - /* If we are shutting things down anyway we - * don't care about failing commands. */ + log_full(success ? LOG_DEBUG : LOG_NOTICE, + "%s: control process exited, code=%s status=%i", u->meta.id, sigchld_code_to_string(code), status); + s->failure = s->failure || !success; - if (s->control_command && s->control_command->command_next && success) { + if (s->control_command && + s->control_command->command_next && + success) { /* There is another command to * * execute, so let's do that. */ - log_debug("%s running next command for state %s", u->meta.id, service_state_to_string(s->state)); - service_run_next(s, success); + log_debug("%s running next control command for state %s", u->meta.id, service_state_to_string(s->state)); + service_run_next_control(s, success); } else { /* No further commands for this step, so let's @@ -2037,7 +2438,7 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) { * executed. */ if ((r = service_load_pid_file(s)) < 0) - log_warning("%s: failed to load PID file %s: %s", UNIT(s)->meta.id, s->pid_file, strerror(-r)); + log_warning("%s: failed to load PID file %s: %s", s->meta.id, s->pid_file, strerror(-r)); } /* Fall through */ @@ -2074,8 +2475,10 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) { assert_not_reached("Uh, control process died at wrong time."); } } - } else - assert_not_reached("Got SIGCHLD for unkown PID"); + } + + /* Notify clients about changed exit status */ + unit_add_to_dbus_queue(u); } static void service_timer_event(Unit *u, uint64_t elapsed, Watch* w) { @@ -2130,12 +2533,12 @@ static void service_timer_event(Unit *u, uint64_t elapsed, Watch* w) { break; case SERVICE_FINAL_SIGKILL: - log_warning("%s still around after SIGKILL (2). Entering maintainance mode.", u->meta.id); + log_warning("%s still around after SIGKILL (2). Entering failed mode.", u->meta.id); service_enter_dead(s, false, true); break; case SERVICE_AUTO_RESTART: - log_debug("%s holdoff time over, scheduling restart.", u->meta.id); + log_info("%s holdoff time over, scheduling restart.", u->meta.id); service_enter_restart(s); break; @@ -2163,21 +2566,166 @@ static void service_cgroup_notify_event(Unit *u) { service_enter_running(s, true); break; + case SERVICE_STOP_SIGTERM: + case SERVICE_STOP_SIGKILL: + if (main_pid_good(s) <= 0 && !control_pid_good(s)) + service_enter_stop_post(s, true); + + break; + + case SERVICE_FINAL_SIGTERM: + case SERVICE_FINAL_SIGKILL: + if (main_pid_good(s) <= 0 && !control_pid_good(s)) + service_enter_dead(s, true, true); + + break; + default: ; } } +static void service_notify_message(Unit *u, pid_t pid, char **tags) { + Service *s = SERVICE(u); + const char *e; + + assert(u); + + if (s->notify_access == NOTIFY_NONE) { + log_warning("%s: Got notification message from PID %lu, but reception is disabled.", + u->meta.id, (unsigned long) pid); + return; + } + + if (s->notify_access == NOTIFY_MAIN && pid != s->main_pid) { + log_warning("%s: Got notification message from PID %lu, but reception only permitted for PID %lu", + u->meta.id, (unsigned long) pid, (unsigned long) s->main_pid); + return; + } + + log_debug("%s: Got message", u->meta.id); + + /* Interpret MAINPID= */ + if ((e = strv_find_prefix(tags, "MAINPID=")) && + (s->state == SERVICE_START || + s->state == SERVICE_START_POST || + s->state == SERVICE_RUNNING || + s->state == SERVICE_RELOAD)) { + + if (parse_pid(e + 8, &pid) < 0) + log_warning("Failed to parse notification message %s", e); + else { + log_debug("%s: got %s", u->meta.id, e); + service_set_main_pid(s, pid); + } + } + + /* Interpret READY= */ + if (s->type == SERVICE_NOTIFY && + s->state == SERVICE_START && + strv_find(tags, "READY=1")) { + log_debug("%s: got READY=1", u->meta.id); + + service_enter_start_post(s); + } + + /* Interpret STATUS= */ + if ((e = strv_find_prefix(tags, "STATUS="))) { + char *t; + + if (e[7]) { + if (!(t = strdup(e+7))) { + log_error("Failed to allocate string."); + return; + } + + log_debug("%s: got %s", u->meta.id, e); + + free(s->status_text); + s->status_text = t; + } else { + free(s->status_text); + s->status_text = NULL; + } + + } + + /* Notify clients about changed status or main pid */ + unit_add_to_dbus_queue(u); +} + static int service_enumerate(Manager *m) { char **p; unsigned i; DIR *d = NULL; char *path = NULL, *fpath = NULL, *name = NULL; + Set *runlevel_services[ELEMENTSOF(rcnd_table)], *shutdown_services = NULL; + Unit *service; + Iterator j; int r; +#ifdef TARGET_ARCH + Unit *previous = NULL; + char *arch_daemons = NULL; + char *arch_daemons_stripped = NULL; + char **arch_daemons_split = NULL; +#endif assert(m); - STRV_FOREACH(p, m->sysvrcnd_path) +#ifdef TARGET_ARCH + if ((r = parse_env_file("/etc/rc.conf", NEWLINE, + "DAEMONS", &arch_daemons, + NULL)) < 0) { + + if (r != -ENOENT) + log_warning("Failed to read /etc/rc.conf: %s", strerror(-r)); + + } else if (arch_daemons) { + if (!(arch_daemons_stripped = strchr(arch_daemons, '('))) + arch_daemons_stripped = arch_daemons; + else + arch_daemons_stripped++; /* strip start paren */ + + arch_daemons_stripped[strcspn(arch_daemons_stripped, ")")] = 0; /* strip end paren */ + + if (!(arch_daemons_split = strv_split_quoted(arch_daemons_stripped))) { + r = -ENOMEM; + goto finish; + } + + STRV_FOREACH(p, arch_daemons_split) { + + free(name); + + if (**p == '!') /* daemons prefixed with ! are disabled, so ignore them */ + continue; + + if (!(name = sysv_translate_name(*p))) { + r = -ENOMEM; + goto finish; + } + + if ((r = manager_load_unit_prepare(m, name, NULL, NULL, &service)) < 0) { + log_warning("Failed to prepare unit %s: %s", name, strerror(-r)); + continue; + } + + if ((r = unit_add_two_dependencies_by_name_inverse(service, UNIT_AFTER, UNIT_WANTS, "multi-user.target", NULL, true)) < 0) + goto finish; + + if (previous) + if ((r = unit_add_dependency(service, UNIT_AFTER, previous, true)) < 0) + goto finish; + + if (**p != '@') /* daemons prefixed with @ can be started in the background */ + previous = service; + } + } +#endif + + zero(runlevel_services); + + STRV_FOREACH(p, m->lookup_paths.sysvrcnd_path) for (i = 0; i < ELEMENTSOF(rcnd_table); i ++) { struct dirent *de; @@ -2199,7 +2747,6 @@ static int service_enumerate(Manager *m) { } while ((de = readdir(d))) { - Unit *service; int a, b; if (ignore_file(de->d_name)) @@ -2238,63 +2785,89 @@ static int service_enumerate(Manager *m) { goto finish; } - if ((r = manager_load_unit_prepare(m, name, NULL, &service)) < 0) { + if ((r = manager_load_unit_prepare(m, name, NULL, NULL, &service)) < 0) { log_warning("Failed to prepare unit %s: %s", name, strerror(-r)); continue; } - if (de->d_name[0] == 'S' && - (rcnd_table[i].type == RUNLEVEL_UP || rcnd_table[i].type == RUNLEVEL_BASIC)) - SERVICE(service)->sysv_start_priority = - MAX(a*10 + b, SERVICE(service)->sysv_start_priority); - - manager_dispatch_load_queue(m); - service = unit_follow_merge(service); + if (de->d_name[0] == 'S') { - if (de->d_name[0] == 'S') { - Unit *runlevel_target; + 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 ((r = manager_load_unit(m, rcnd_table[i].target, NULL, &runlevel_target)) < 0) - goto finish; + SERVICE(service)->sysv_enabled = true; + } - if ((r = unit_add_dependency(runlevel_target, UNIT_WANTS, service, true)) < 0) + if ((r = set_ensure_allocated(&runlevel_services[i], trivial_hash_func, trivial_compare_func)) < 0) goto finish; - if ((r = unit_add_dependency(service, UNIT_BEFORE, runlevel_target, true)) < 0) + if ((r = set_put(runlevel_services[i], service)) < 0) goto finish; - } else if (de->d_name[0] == 'K' && rcnd_table[i].type == RUNLEVEL_DOWN) { - Unit *shutdown_target; - - /* We honour K links only for - * halt/reboot. For the normal - * runlevels we assume the - * stop jobs will be - * implicitly added by the - * core logic. Also, we don't - * really distuingish here - * between the runlevels 0 and - * 6 and just add them to the - * special shutdown target. */ - - if ((r = manager_load_unit(m, SPECIAL_SHUTDOWN_TARGET, NULL, &shutdown_target)) < 0) - goto finish; + } else if (de->d_name[0] == 'K' && + (rcnd_table[i].type == RUNLEVEL_DOWN || + rcnd_table[i].type == RUNLEVEL_SYSINIT)) { - if ((r = unit_add_dependency(service, UNIT_CONFLICTS, shutdown_target, true)) < 0) + if ((r = set_ensure_allocated(&shutdown_services, trivial_hash_func, trivial_compare_func)) < 0) goto finish; - if ((r = unit_add_dependency(service, UNIT_BEFORE, shutdown_target, true)) < 0) + if ((r = set_put(shutdown_services, service)) < 0) goto finish; } } } + /* Now we loaded all stubs and are aware of the lowest + start-up priority for all services, not let's actually load + the services, this will also tell us which services are + actually native now */ + manager_dispatch_load_queue(m); + + /* If this is a native service, rely on native ways to pull in + * a service, don't pull it in via sysv rcN.d links. */ + for (i = 0; i < ELEMENTSOF(rcnd_table); i ++) + SET_FOREACH(service, runlevel_services[i], j) { + service = unit_follow_merge(service); + + if (service->meta.fragment_path) + continue; + + if ((r = unit_add_two_dependencies_by_name_inverse(service, UNIT_AFTER, UNIT_WANTS, rcnd_table[i].target, NULL, true)) < 0) + goto finish; + } + + /* We honour K links only for halt/reboot. For the normal + * runlevels we assume the stop jobs will be implicitly added + * by the core logic. Also, we don't really distuingish here + * between the runlevels 0 and 6 and just add them to the + * 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.*/ + SET_FOREACH(service, shutdown_services, j) { + service = unit_follow_merge(service); + + if (service->meta.fragment_path) + continue; + + if ((r = unit_add_two_dependencies_by_name_inverse(service, UNIT_AFTER, UNIT_CONFLICTS, SPECIAL_SHUTDOWN_TARGET, NULL, true)) < 0) + goto finish; + } + r = 0; finish: free(path); free(fpath); free(name); +#ifdef TARGET_ARCH + free(arch_daemons); + free(arch_daemons_split); +#endif + + for (i = 0; i < ELEMENTSOF(rcnd_table); i++) + set_free(runlevel_services[i]); + set_free(shutdown_services); if (d) closedir(d); @@ -2365,10 +2938,10 @@ static void service_bus_query_pid_done( s->state == SERVICE_START_POST || s->state == SERVICE_RUNNING || s->state == SERVICE_RELOAD)) - s->main_pid = pid; + service_set_main_pid(s, pid); } -int service_set_socket_fd(Service *s, int fd) { +int service_set_socket_fd(Service *s, int fd, Socket *sock) { assert(s); assert(fd >= 0); @@ -2376,7 +2949,7 @@ int service_set_socket_fd(Service *s, int fd) { * service for a stream socket and the socket needs to be * configured. */ - if (UNIT(s)->meta.load_state != UNIT_LOADED) + if (s->meta.load_state != UNIT_LOADED) return -EINVAL; if (s->socket_fd >= 0) @@ -2387,9 +2960,22 @@ int service_set_socket_fd(Service *s, int fd) { s->socket_fd = fd; s->got_socket_fd = true; + s->socket = sock; + return 0; } +static void service_reset_failed(Unit *u) { + Service *s = SERVICE(u); + + assert(s); + + if (s->state == SERVICE_FAILED) + service_set_state(s, SERVICE_DEAD); + + s->failure = false; +} + static const char* const service_state_table[_SERVICE_STATE_MAX] = { [SERVICE_DEAD] = "dead", [SERVICE_START_PRE] = "start-pre", @@ -2404,7 +2990,7 @@ static const char* const service_state_table[_SERVICE_STATE_MAX] = { [SERVICE_STOP_POST] = "stop-post", [SERVICE_FINAL_SIGTERM] = "final-sigterm", [SERVICE_FINAL_SIGKILL] = "final-sigkill", - [SERVICE_MAINTAINANCE] = "maintainance", + [SERVICE_FAILED] = "failed", [SERVICE_AUTO_RESTART] = "auto-restart", }; @@ -2419,10 +3005,11 @@ static const char* const service_restart_table[_SERVICE_RESTART_MAX] = { DEFINE_STRING_TABLE_LOOKUP(service_restart, ServiceRestart); static const char* const service_type_table[_SERVICE_TYPE_MAX] = { - [SERVICE_FORKING] = "forking", [SERVICE_SIMPLE] = "simple", - [SERVICE_FINISH] = "finish", - [SERVICE_DBUS] = "dbus" + [SERVICE_FORKING] = "forking", + [SERVICE_ONESHOT] = "oneshot", + [SERVICE_DBUS] = "dbus", + [SERVICE_NOTIFY] = "notify" }; DEFINE_STRING_TABLE_LOOKUP(service_type, ServiceType); @@ -2438,8 +3025,17 @@ static const char* const service_exec_command_table[_SERVICE_EXEC_COMMAND_MAX] = DEFINE_STRING_TABLE_LOOKUP(service_exec_command, ServiceExecCommand); +static const char* const notify_access_table[_NOTIFY_ACCESS_MAX] = { + [NOTIFY_NONE] = "none", + [NOTIFY_MAIN] = "main", + [NOTIFY_ALL] = "all" +}; + +DEFINE_STRING_TABLE_LOOKUP(notify_access, NotifyAccess); + const UnitVTable service_vtable = { .suffix = ".service", + .show_status = true, .init = service_init, .done = service_done, @@ -2467,12 +3063,17 @@ const UnitVTable service_vtable = { .sigchld_event = service_sigchld_event, .timer_event = service_timer_event, + .reset_failed = service_reset_failed, + .cgroup_notify_empty = service_cgroup_notify_event, + .notify_message = service_notify_message, .bus_name_owner_change = service_bus_name_owner_change, .bus_query_pid_done = service_bus_query_pid_done, + .bus_interface = "org.freedesktop.systemd1.Service", .bus_message_handler = bus_service_message_handler, + .bus_invalidating_properties = bus_service_invalidating_properties, .enumerate = service_enumerate };