From 75fbd19388badbdd68f7e4e0ae0f723501629c86 Mon Sep 17 00:00:00 2001 From: Evgeny Vereshchagin Date: Wed, 11 Nov 2015 00:03:24 +0000 Subject: systemctl: fix cancel http://www.freedesktop.org/software/systemd/man/systemctl.html#cancel%20JOB... > If no job ID is specified, cancel all pending jobs --- src/systemctl/systemctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index 70871cf3e6..85deb4a761 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -7439,7 +7439,7 @@ static int systemctl_main(int argc, char *argv[]) { { "list-jobs", VERB_ANY, VERB_ANY, 0, list_jobs }, { "list-machines", VERB_ANY, VERB_ANY, 0, list_machines }, { "clear-jobs", VERB_ANY, 1, 0, daemon_reload }, - { "cancel", 2, VERB_ANY, 0, cancel_job }, + { "cancel", VERB_ANY, VERB_ANY, 0, cancel_job }, { "start", 2, VERB_ANY, 0, start_unit }, { "stop", 2, VERB_ANY, 0, start_unit }, { "condstop", 2, VERB_ANY, 0, start_unit }, /* For compatibility with ALTLinux */ -- cgit v1.2.3-54-g00ecf From 6a32563caa883bd11da1b255c38358e481c42ad7 Mon Sep 17 00:00:00 2001 From: Evgeny Vereshchagin Date: Wed, 11 Nov 2015 01:17:13 +0000 Subject: systemctl: return EXIT_SUCCESS on success --- src/systemctl/systemctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index 85deb4a761..d244389ddd 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -7815,5 +7815,5 @@ finish: release_busses(); - return r < 0 ? EXIT_FAILURE : r; + return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; } -- cgit v1.2.3-54-g00ecf