chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
units: split fsck.target from sysinit.target for suse compat
[elogind.git]
/
src
/
systemctl.c
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: