From: Michal Schmidt <mschmidt@redhat.com>
Date: Thu, 5 Aug 2010 12:00:00 +0000 (+0200)
Subject: reboot: handle -p switch properly
X-Git-Tag: v6~15
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=a042efad57741e90ee78b69c57310858295bf3fc

reboot: handle -p switch properly

https://bugzilla.redhat.com/show_bug.cgi?id=618678
---

diff --git a/src/systemctl.c b/src/systemctl.c
index 1640a60a7..3ca146447 100644
--- a/src/systemctl.c
+++ b/src/systemctl.c
@@ -3933,7 +3933,8 @@ static int halt_parse_argv(int argc, char *argv[]) {
                         break;
 
                 case 'p':
-                        arg_action = ACTION_POWEROFF;
+                        if (arg_action != ACTION_REBOOT)
+                                arg_action = ACTION_POWEROFF;
                         break;
 
                 case ARG_REBOOT: