shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-10 01:17:44 +03:00
Code

Revert "systemctl: if no logind, don't try to schedule shutdown"

Browse Source 
This reverts commit c68867da32.
This commit is contained in:
Dimitri John Ledkov 2018-09-10 19:54:12 +01:00
parent 7f56c3d46e
commit cf9cda441a
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/systemctl/systemctl.c
View File

@ -8511,6 +8511,7 @@ static int halt_now(enum action a) {
static int logind_schedule_shutdown(void) { static int logind_schedule_shutdown(void) {
#if ENABLE_LOGIND
_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;
char date[FORMAT_TIMESTAMP_MAX]; char date[FORMAT_TIMESTAMP_MAX];
const char *action; const char *action;
@ -8562,6 +8563,10 @@ static int logind_schedule_shutdown(void) {
if (!arg_quiet) if (!arg_quiet)
log_info("Shutdown scheduled for %s, use 'shutdown -c' to cancel.", format_timestamp(date, sizeof(date), arg_when)); log_info("Shutdown scheduled for %s, use 'shutdown -c' to cancel.", format_timestamp(date, sizeof(date), arg_when));
return 0; return 0;
#else
log_error("Cannot schedule shutdown without logind support, proceeding with immediate shutdown.");
return -ENOSYS;
#endif
} }
static int halt_main(void) { static int halt_main(void) {
@ -8572,11 +8577,7 @@ static int halt_main(void) {
return r; return r;
if (arg_when > 0) if (arg_when > 0)
#if ENABLE_LOGIND
return logind_schedule_shutdown(); return logind_schedule_shutdown();
#else
log_error("Cannot schedule shutdown without logind support, proceeding with immediate shutdown.");
#endif
if (geteuid() != 0) { if (geteuid() != 0) {
if (arg_dry_run || arg_force > 0) { if (arg_dry_run || arg_force > 0) {