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 1640a60a70960131fc91a3adc9015665f4bb26a9..3ca146447aa4c181b9c2e127aaaa2766f206a6e4 100644 (file)
--- 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: