shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-08 11:27:32 +03:00
Code

systemctl: move shutdown cancelling code into its own function

Browse Source 
Let's make sure the main switch statement only invokes functions, but
doesn't do anything real on its own.
This commit is contained in:
Lennart Poettering 2015-09-24 11:56:04 +02:00
parent 4f16c1f479
commit 949d9ce954
1 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/systemctl/systemctl.c
View File

@ -7562,6 +7562,36 @@ static int runlevel_main(void) {
return 0; return 0;
} }
static int cancel_shutdown(void) {
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
_cleanup_bus_flush_close_unref_ sd_bus *b = NULL;
int r;
if (avoid_bus()) {
log_error("Unable to perform operation without bus connection.");
return -ENOSYS;
}
r = sd_bus_open_system(&b);
if (r < 0)
return log_error_errno(r, "Unable to open system bus: %m");
(void) set_wall_message(b);
r = sd_bus_call_method(
b,
"org.freedesktop.login1",
"/org/freedesktop/login1",
"org.freedesktop.login1.Manager",
"CancelScheduledShutdown",
&error,
NULL, NULL);
if (r < 0)
return log_warning_errno(r, "Failed to talk to logind, shutdown hasn't been cancelled: %s", bus_error_message(&error, r));
return 0;
}
int main(int argc, char*argv[]) { int main(int argc, char*argv[]) {
_cleanup_bus_flush_close_unref_ sd_bus *bus = NULL; _cleanup_bus_flush_close_unref_ sd_bus *bus = NULL;
int r; int r;
@ -7622,34 +7652,9 @@ int main(int argc, char*argv[]) {
r = reload_with_fallback(bus); r = reload_with_fallback(bus);
break; break;
case ACTION_CANCEL_SHUTDOWN: { case ACTION_CANCEL_SHUTDOWN:
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; r = cancel_shutdown();
_cleanup_bus_flush_close_unref_ sd_bus *b = NULL;
if (avoid_bus()) {
log_error("Unable to perform operation without bus connection.");
return -ENOSYS;
}
r = sd_bus_open_system(&b);
if (r < 0)
return log_error_errno(r, "Unable to open system bus: %m");
(void) set_wall_message(b);
r = sd_bus_call_method(
b,
"org.freedesktop.login1",
"/org/freedesktop/login1",
"org.freedesktop.login1.Manager",
"CancelScheduledShutdown",
&error,
NULL, NULL);
if (r < 0)
log_warning_errno(r, "Failed to talk to logind, shutdown hasn't been cancelled: %s",
bus_error_message(&error, r));
break; break;
}
case ACTION_RUNLEVEL: case ACTION_RUNLEVEL:
r = runlevel_main(); r = runlevel_main();