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

Merge pull request #10061 from xnox/fix-logindless-scheduled-shutdown 

Fix logindless scheduled shutdown
This commit is contained in:
Lennart Poettering 2018-09-12 20:45:31 +02:00 committed by GitHub
parent b2b9edd4d1 940bec70bb
commit b0b3ba69c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/systemctl/systemctl.c
View File

@ -8501,8 +8501,9 @@ static int halt_now(enum action a) {
}
}
#if ENABLE_LOGIND
static int logind_schedule_shutdown(void) {
#if ENABLE_LOGIND
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
char date[FORMAT_TIMESTAMP_MAX];
const char *action;
@ -8554,8 +8555,11 @@ static int logind_schedule_shutdown(void) {
if (!arg_quiet)
log_info("Shutdown scheduled for %s, use 'shutdown -c' to cancel.", format_timestamp(date, sizeof(date), arg_when));
return 0;
}
#else
log_error("Cannot schedule shutdown without logind support, proceeding with immediate shutdown.");
return -ENOSYS;
#endif
}
static int halt_main(void) {
int r;
@ -8564,12 +8568,10 @@ static int halt_main(void) {
if (r < 0)
return r;
if (arg_when > 0)
#if ENABLE_LOGIND
return logind_schedule_shutdown();
#else
log_error("Cannot schedule shutdown without logind support, proceeding with immediate shutdown.");
#endif
/* Delayed shutdown requested, and was successful */
if (arg_when > 0 && logind_schedule_shutdown() == 0)
return 0;
/* no delay, or logind failed or is not at all available */
if (geteuid() != 0) {
if (arg_dry_run || arg_force > 0) {