chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
service: add options RestartPreventExitStatus and SuccessExitStatus
[elogind.git]
/
src
/
core
/
socket.c
diff --git
a/src/core/socket.c
b/src/core/socket.c
index 19b463e6a452553c6cc922f79764ab796bd5202f..cbbfb0cd3a033436a7215ec36fa72300a78ffa01 100644
(file)
--- a/
src/core/socket.c
+++ b/
src/core/socket.c
@@
-374,7
+374,7
@@
static int socket_load(Unit *u) {
if ((r = socket_add_default_dependencies(s)) < 0)
return r;
if ((r = socket_add_default_dependencies(s)) < 0)
return r;
- r = unit_
patch_working_directory(UNIT(s)
, &s->exec_context);
+ r = unit_
exec_context_defaults(u
, &s->exec_context);
if (r < 0)
return r;
}
if (r < 0)
return r;
}
@@
-1884,7
+1884,7
@@
static void socket_sigchld_event(Unit *u, pid_t pid, int code, int status) {
s->control_pid = 0;
s->control_pid = 0;
- if (is_clean_exit(code, status))
+ if (is_clean_exit(code, status
, NULL
))
f = SOCKET_SUCCESS;
else if (code == CLD_EXITED)
f = SOCKET_FAILURE_EXIT_CODE;
f = SOCKET_SUCCESS;
else if (code == CLD_EXITED)
f = SOCKET_FAILURE_EXIT_CODE;