diff --git a/src/basic/special.h b/src/basic/special.h index a5cdfebae5..a5774f9590 100644 --- a/src/basic/special.h +++ b/src/basic/special.h @@ -110,6 +110,9 @@ #define SPECIAL_SIGPWR_TARGET "sigpwr.target" #define SPECIAL_CTRL_ALT_DEL_TARGET "ctrl-alt-del.target" +/* The unit to use as fallback if ctrl-alt-del.target (which is usually an alias) cannot be loaded. */ +#define FALLBACK_CTRL_ALT_DEL_TARGET "reboot.target" + /* Where we add all our system units, users and machines by default */ #define SPECIAL_SYSTEM_SLICE "system.slice" #define SPECIAL_USER_SLICE "user.slice" diff --git a/src/core/manager.c b/src/core/manager.c index 2e0ac49d98..ae44f87b2a 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -3220,10 +3220,10 @@ turn_off: return 0; } -static void manager_start_special(Manager *m, const char *name, JobMode mode) { +static void manager_start_special_with_fallback(Manager *m, const char *name, const char *fallback, JobMode mode) { Job *job; - if (manager_add_job_by_name_or_warn(m, JOB_START, name, mode, NULL, &job) < 0) + if (manager_add_job_by_name_or_warn_with_fallback(m, JOB_START, name, fallback, mode, /* affected_jobs= */ NULL, &job) < 0) return; const char *s = unit_status_string(job->unit, NULL); @@ -3235,6 +3235,10 @@ static void manager_start_special(Manager *m, const char *name, JobMode mode) { m->status_ready = false; } +static void manager_start_special(Manager *m, const char *name, JobMode mode) { + manager_start_special_with_fallback(m, name, /* fallback= */ NULL, mode); +} + static void manager_handle_ctrl_alt_del(Manager *m) { assert(m); @@ -3242,7 +3246,11 @@ static void manager_handle_ctrl_alt_del(Manager *m) { * unless it was disabled in system.conf. */ if (ratelimit_below(&m->ctrl_alt_del_ratelimit) || m->cad_burst_action == EMERGENCY_ACTION_NONE) - manager_start_special(m, SPECIAL_CTRL_ALT_DEL_TARGET, JOB_REPLACE_IRREVERSIBLY); + manager_start_special_with_fallback( + m, + SPECIAL_CTRL_ALT_DEL_TARGET, + FALLBACK_CTRL_ALT_DEL_TARGET, + JOB_REPLACE_IRREVERSIBLY); else emergency_action( m,