From a042efad57741e90ee78b69c57310858295bf3fc Mon Sep 17 00:00:00 2001 From: Michal Schmidt Date: Thu, 5 Aug 2010 14:00:00 +0200 Subject: [PATCH] reboot: handle -p switch properly https://bugzilla.redhat.com/show_bug.cgi?id=618678 --- src/systemctl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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: -- 2.30.2