chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
auto-getty: rework auto console getty logic to work in conjunction with single user...
[elogind.git]
/
src
/
execute.c
diff --git
a/src/execute.c
b/src/execute.c
index 6b6c2855b48739c04febe6878c37d6370f3e3b11..b4ddf8961f390071f690be5c588e01cb8d247917 100644
(file)
--- a/
src/execute.c
+++ b/
src/execute.c
@@
-1,4
+1,4
@@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8
; indent-tabs-mode: nil
-*-*/
/***
This file is part of systemd.
/***
This file is part of systemd.
@@
-976,7
+976,8
@@
int exec_spawn(ExecCommand *command,
/* Close sockets very early to make sure we don't
* block init reexecution because it cannot bind its
* sockets */
/* Close sockets very early to make sure we don't
* block init reexecution because it cannot bind its
* sockets */
- if (close_all_fds(fds, n_fds) < 0) {
+ if (close_all_fds(socket_fd >= 0 ? &socket_fd : fds,
+ socket_fd >= 0 ? 1 : n_fds) < 0) {
r = EXIT_FDS;
goto fail;
}
r = EXIT_FDS;
goto fail;
}
@@
-1054,7
+1055,7
@@
int exec_spawn(ExecCommand *command,
}
if (cgroup_bondings)
}
if (cgroup_bondings)
- if (
(r = cgroup_bonding_install_list(cgroup_bondings, 0)
) < 0) {
+ if (
cgroup_bonding_install_list(cgroup_bondings, 0
) < 0) {
r = EXIT_CGROUP;
goto fail;
}
r = EXIT_CGROUP;
goto fail;
}