mirror of
https://github.com/systemd/systemd.git
synced 2025-03-28 02:50:16 +03:00
manager: run ctrl-alt-del/kbrequest targets on SIGINT/SIGWINCH when run in init mode
This commit is contained in:
parent
036643a247
commit
84e9af1e01
36
manager.c
36
manager.c
@ -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));
|
||||
|
Loading…
x
Reference in New Issue
Block a user