X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fservice.c;h=a5d1ebd84b6d780a41cecb0936b9e2da80d544ef;hp=35f2e9ad2c8931484f7697f77ce5de0e46a76384;hb=92abbefbefb0adafb6714c8d8f9d25bc8280a2f7;hpb=2105e76a7725d6a29ebfe0af0bf23b3279e466a2 diff --git a/src/service.c b/src/service.c index 35f2e9ad2..a5d1ebd84 100644 --- a/src/service.c +++ b/src/service.c @@ -33,6 +33,7 @@ #include "unit-name.h" #include "dbus-service.h" #include "special.h" +#include "bus-errors.h" #define COMMENTS "#;\n" #define NEWLINES "\n\r" @@ -630,6 +631,7 @@ static int service_load_sysv_path(Service *s, const char *path) { goto finish; } + free(u->meta.description); u->meta.description = d; } else if (startswith_no_case(t, "X-Interactive:")) { @@ -683,9 +685,9 @@ static int service_load_sysv_path(Service *s, const char *path) { /* Special setting for all SysV services */ s->type = SERVICE_FORKING; s->valid_no_process = true; - s->kill_mode = KILL_PROCESS_GROUP; s->restart = SERVICE_ONCE; s->exec_context.std_output = EXEC_OUTPUT_TTY; + s->exec_context.kill_mode = KILL_PROCESS_GROUP; u->meta.load_state = UNIT_LOADED; r = 0; @@ -820,7 +822,7 @@ static int service_verify(Service *s) { return -EINVAL; } - if (s->exec_context.pam_name && s->kill_mode != KILL_CONTROL_GROUP) { + 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; } @@ -927,14 +929,12 @@ static void service_dump(Unit *u, FILE *f, const char *prefix) { "%sPermissionsStartOnly: %s\n" "%sRootDirectoryStartOnly: %s\n" "%sValidNoProcess: %s\n" - "%sKillMode: %s\n" "%sType: %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, notify_access_to_string(s->notify_access)); @@ -1179,6 +1179,11 @@ static void service_set_state(Service *s, ServiceState state) { 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", s->meta.id, service_state_to_string(old_state), service_state_to_string(state)); @@ -1322,6 +1327,7 @@ static int service_spawn( bool pass_fds, bool apply_permissions, bool apply_chroot, + bool apply_tty_stdin, bool set_notify_socket, pid_t *_pid) { @@ -1394,6 +1400,7 @@ static int service_spawn( final_env, apply_permissions, apply_chroot, + apply_tty_stdin, s->meta.manager->confirm_spawn, s->meta.cgroup_bondings, &pid); @@ -1504,6 +1511,7 @@ 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; @@ -1529,10 +1537,10 @@ static void service_enter_signal(Service *s, ServiceState state, bool success) { 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->exec_context.kill_mode == KILL_CONTROL_GROUP) { if ((r = cgroup_bonding_kill_list(s->meta.cgroup_bondings, sig)) < 0) { if (r != -EAGAIN && r != -ESRCH) @@ -1545,14 +1553,14 @@ static void service_enter_signal(Service *s, ServiceState state, bool success) { r = 0; if (s->main_pid > 0) { - if (kill(s->kill_mode == KILL_PROCESS ? s->main_pid : -s->main_pid, sig) < 0 && errno != ESRCH) + if (kill(s->exec_context.kill_mode == KILL_PROCESS ? s->main_pid : -s->main_pid, sig) < 0 && errno != ESRCH) r = -errno; else sent = true; } if (s->control_pid > 0) { - if (kill(s->kill_mode == KILL_PROCESS ? s->control_pid : -s->control_pid, sig) < 0 && errno != ESRCH) + if (kill(s->exec_context.kill_mode == KILL_PROCESS ? s->control_pid : -s->control_pid, sig) < 0 && errno != ESRCH) r = -errno; else sent = true; @@ -1604,6 +1612,7 @@ static void service_enter_stop(Service *s, bool success) { !s->permissions_start_only, !s->root_directory_start_only, false, + false, &s->control_pid)) < 0) goto fail; @@ -1652,6 +1661,7 @@ static void service_enter_start_post(Service *s) { !s->permissions_start_only, !s->root_directory_start_only, false, + false, &s->control_pid)) < 0) goto fail; @@ -1686,6 +1696,7 @@ static void service_enter_start(Service *s) { true, true, true, + true, s->notify_access != NOTIFY_NONE, &pid)) < 0) goto fail; @@ -1746,6 +1757,7 @@ 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; @@ -1763,20 +1775,24 @@ fail: 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(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, NULL, NULL)) < 0) goto fail; log_debug("%s scheduled restart job.", s->meta.id); return; fail: - - log_warning("%s failed to schedule restart job: %s", 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) { @@ -1795,6 +1811,7 @@ static void service_enter_reload(Service *s) { !s->permissions_start_only, !s->root_directory_start_only, false, + false, &s->control_pid)) < 0) goto fail; @@ -1829,6 +1846,8 @@ 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; @@ -1877,6 +1896,14 @@ 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; @@ -1890,12 +1917,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->allow_restart = false; /* Already on it */ if (s->state == SERVICE_STOP || @@ -1906,16 +1930,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; @@ -2153,7 +2185,6 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) { assert(pid >= 0); success = is_clean_exit(code, status); - s->failure = s->failure || !success; if (s->main_pid == pid) { @@ -2163,9 +2194,14 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) { if (s->type != SERVICE_FORKING) { assert(s->exec_command[SERVICE_EXEC_START]); s->exec_command[SERVICE_EXEC_START]->exec_status = s->main_exec_status; + + if (s->exec_command[SERVICE_EXEC_START]->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. */ @@ -2212,12 +2248,18 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) { } else if (s->control_pid == pid) { - if (s->control_command) + if (s->control_command) { exec_status_exit(&s->control_command->exec_status, pid, code, status); + if (s->control_command->ignore) + success = true; + } + s->control_pid = 0; - log_debug("%s: control process exited, code=%s status=%i", u->meta.id, sigchld_code_to_string(code), status); + 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 we are shutting things down anyway we * don't care about failing commands. */ @@ -2436,7 +2478,7 @@ static void service_notify_message(Unit *u, pid_t pid, char **tags) { s->state == SERVICE_RELOAD)) { if (parse_pid(e + 8, &pid) < 0) - log_warning("Failed to parse %s", e); + 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); @@ -2538,7 +2580,7 @@ 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; } @@ -2551,6 +2593,13 @@ static int service_enumerate(Manager *m) { manager_dispatch_load_queue(m); service = unit_follow_merge(service); + /* 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. */ + if (service->meta.fragment_path) + continue; + if (de->d_name[0] == 'S') { if ((r = unit_add_two_dependencies_by_name_inverse(service, UNIT_AFTER, UNIT_WANTS, rcnd_table[i].target, NULL, true)) < 0)