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:
783e05d
)
core/service: only search for pid if loading from file failed
author
Zbigniew Jędrzejewski-Szmek
<zbyszek@in.waw.pl>
Sat, 9 Apr 2016 01:09:17 +0000
(21:09 -0400)
committer
Zbigniew Jędrzejewski-Szmek
<zbyszek@in.waw.pl>
Sat, 9 Apr 2016 01:09:17 +0000
(21:09 -0400)
CID #1237511.
src/core/service.c
patch
|
blob
|
history
diff --git
a/src/core/service.c
b/src/core/service.c
index
8f59c41
..
c5cbf0f
100644
(file)
--- a/
src/core/service.c
+++ b/
src/core/service.c
@@
-2751,10
+2751,9
@@
static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) {
break;
case SERVICE_RELOAD:
- if (f == SERVICE_SUCCESS) {
- service_load_pid_file(s, true);
- service_search_main_pid(s);
- }
+ if (f == SERVICE_SUCCESS)
+ if (service_load_pid_file(s, true) < 0)
+ service_search_main_pid(s);
s->reload_result = f;
service_enter_running(s, SERVICE_SUCCESS);