From: Michael Olbrich Date: Sun, 8 Feb 2015 19:29:50 +0000 (+0100) Subject: systemctl: don't update the reboot parameter if none is given X-Git-Tag: v219~68 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;ds=sidebyside;h=c31c4324c5120d9b38f8a5e39623c8242ee001e0;p=elogind.git systemctl: don't update the reboot parameter if none is given Otherwise systemd-reboot.service will remove the parameter that was set before. This was broken in commit "b986229efe2cc96157aa14c37bab7843311bbef1 systemctl: bugfix for systemctl reboot command with argument" --- diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index 2d70ff1de..7b81a9c98 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -2993,7 +2993,7 @@ static int start_special(sd_bus *bus, char **args) { return -EPERM; } - if (a == ACTION_REBOOT) { + if (a == ACTION_REBOOT && args[1]) { r = update_reboot_param_file(args[1]); if (r < 0) return r;