picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

manager: run ctrl-alt-del/kbrequest targets on SIGINT/SIGWINCH when run in init mode

This commit is contained in:
Lennart Poettering 2010-02-13 01:17:08 +01:00
parent 036643a247
commit 84e9af1e01
1 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
manager.c
View File

@ -1353,8 +1353,40 @@ static int manager_process_signal_fd(Manager *m, bool *quit) {
case SIGINT:
case SIGTERM:
*quit = true;
return 0;
if (m->running_as != MANAGER_INIT) {
*quit = true;
return 0;
} else {
Unit *target;
int r;
if ((r = manager_load_unit(m, SPECIAL_CTRL_ALT_DEL_TARGET, &target)) < 0)
log_error("Failed to load ctrl-alt-del target: %s", strerror(-r));
else if ((r = manager_add_job(m, JOB_START, target, JOB_REPLACE, true, NULL)) < 0)
log_error("Failed to enqueue ctrl-alt-del job: %s", strerror(-r));
break;
}
case SIGWINCH:
if (m->running_as == MANAGER_INIT) {
Unit *target;
int r;
if ((r = manager_load_unit(m, SPECIAL_KBREQUEST_TARGET, &target)) < 0)
log_error("Failed to load kbrequest target: %s", strerror(-r));
else if ((r = manager_add_job(m, JOB_START, target, JOB_REPLACE, true, NULL)) < 0)
log_error("Failed to enqueue kbrequest job: %s", strerror(-r));
break;
}
/* This is a nop on non-init systemd's */
break;
default:
log_info("Got unhandled signal <%s>.", strsignal(sfsi.ssi_signo));