[systemd-devel] [PATCH] systemctl: don't update the reboot parameter if none is given

Michael Olbrich m.olbrich at pengutronix.de
Sun Feb 8 11:29:50 PST 2015


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"
---

This is more a hack than anything else, but I'm not sure who to fix this
otherwise.

Michael

 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 2d70ff1de69e..7b81a9c98592 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;
-- 
2.1.4



More information about the systemd-devel mailing list