projects
/
platform
/
upstream
/
systemd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
bc21034
)
systemctl: Only wait when there's something to wait for.
author
Filipe Brandenburger
<filbranden@google.com>
Fri, 20 Jul 2018 18:32:55 +0000
(11:32 -0700)
committer
Yu Watanabe
<watanabe.yu+github@gmail.com>
Sat, 21 Jul 2018 14:40:08 +0000
(23:40 +0900)
Tested:
- `systemctl --wait start i-do-not-exist.service` does not wait.
- `systemctl --wait start i-do-not-exist.service valid-unit.service` does.
src/systemctl/systemctl.c
patch
|
blob
|
history
diff --git
a/src/systemctl/systemctl.c
b/src/systemctl/systemctl.c
index
6f8934e
..
d9bef99
100644
(file)
--- a/
src/systemctl/systemctl.c
+++ b/
src/systemctl/systemctl.c
@@
-3149,7
+3149,7
@@
static int start_unit(int argc, char *argv[], void *userdata) {
(void) check_triggering_units(bus, *name);
}
- if (r >= 0 && arg_wait) {
+ if (r >= 0 && arg_wait
&& !set_isempty(wait_context.unit_paths)
) {
int q;
q = sd_event_loop(wait_context.event);
if (q < 0)