shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-07 01:27:11 +03:00
Code

manager: remove fallback for user/exit.target

Browse Source 
The comment here was misleading: the job can fail to enqueue for reasons
other than the target not existing.

The fallback caused an error to be logged, and dates back to when the
"user" directory was named "session".  units/session/exit.target was added
later the same year.

This is consistent with the documentation (man systemd), and the handling
of similar signals.  It's also consistent with `systemctl exit`, which is
what most people would expect.
This commit is contained in:
Alan Jenkins 2017-08-02 16:19:22 +01:00
parent dcb1468861
commit c75fbadac6
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/core/manager.c
View File

@ -2012,7 +2012,7 @@ static int manager_dispatch_sigchld(Manager *m) {
return 0; return 0;
} }
static int manager_start_target(Manager *m, const char *name, JobMode mode) { static void manager_start_target(Manager *m, const char *name, JobMode mode) {
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL; _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
int r; int r;
@ -2021,8 +2021,6 @@ static int manager_start_target(Manager *m, const char *name, JobMode mode) {
r = manager_add_job_by_name(m, JOB_START, name, mode, &error, NULL); r = manager_add_job_by_name(m, JOB_START, name, mode, &error, NULL);
if (r < 0) if (r < 0)
log_error("Failed to enqueue %s job: %s", name, bus_error_message(&error, r)); log_error("Failed to enqueue %s job: %s", name, bus_error_message(&error, r));
return r;
} }
static void manager_handle_ctrl_alt_del(Manager *m) { static void manager_handle_ctrl_alt_del(Manager *m) {
@ -2092,17 +2090,10 @@ static int manager_dispatch_signal_fd(sd_event_source *source, int fd, uint32_t
/* Fall through */ /* Fall through */
case SIGINT: case SIGINT:
if (MANAGER_IS_SYSTEM(m)) { if (MANAGER_IS_SYSTEM(m))
manager_handle_ctrl_alt_del(m); manager_handle_ctrl_alt_del(m);
break; else
} manager_start_target(m, SPECIAL_EXIT_TARGET, JOB_REPLACE);
/* Run the exit target if there is one, if not, just exit. */
if (manager_start_target(m, SPECIAL_EXIT_TARGET, JOB_REPLACE) < 0) {
m->exit_code = MANAGER_EXIT;
return 0;
}
break; break;
case SIGWINCH: case SIGWINCH: