chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0d8c31f
)
systemd: return the first error from manager_startup()
author
Zbigniew Jędrzejewski-Szmek
<zbyszek@in.waw.pl>
Fri, 18 Jul 2014 21:05:18 +0000
(17:05 -0400)
committer
Zbigniew Jędrzejewski-Szmek
<zbyszek@in.waw.pl>
Sun, 20 Jul 2014 23:48:16 +0000
(19:48 -0400)
src/core/manager.c
patch
|
blob
|
history
diff --git
a/src/core/manager.c
b/src/core/manager.c
index 2e63c5ef1f967cb8c704dba36da5375cda6c8a2b..0653d7e59aa4ce54fee137201ab63e014dee4153 100644
(file)
--- a/
src/core/manager.c
+++ b/
src/core/manager.c
@@
-1005,11
+1005,8
@@
int manager_startup(Manager *m, FILE *serialization, FDSet *fds) {
dual_timestamp_get(&m->units_load_finish_timestamp);
/* Second, deserialize if there is something to deserialize */
dual_timestamp_get(&m->units_load_finish_timestamp);
/* Second, deserialize if there is something to deserialize */
- if (serialization) {
- q = manager_deserialize(m, serialization, fds);
- if (q < 0)
- r = q;
- }
+ if (serialization)
+ r = manager_deserialize(m, serialization, fds);
/* Any fds left? Find some unit which wants them. This is
* useful to allow container managers to pass some file
/* Any fds left? Find some unit which wants them. This is
* useful to allow container managers to pass some file
@@
-1017,13
+1014,15
@@
int manager_startup(Manager *m, FILE *serialization, FDSet *fds) {
* socket-based activation of entire containers. */
if (fdset_size(fds) > 0) {
q = manager_distribute_fds(m, fds);
* socket-based activation of entire containers. */
if (fdset_size(fds) > 0) {
q = manager_distribute_fds(m, fds);
- if (q < 0)
+ if (q < 0
&& r == 0
)
r = q;
}
/* We might have deserialized the notify fd, but if we didn't
* then let's create the bus now */
r = q;
}
/* We might have deserialized the notify fd, but if we didn't
* then let's create the bus now */
- manager_setup_notify(m);
+ q = manager_setup_notify(m);
+ if (q < 0 && r == 0)
+ r = q;
/* We might have deserialized the kdbus control fd, but if we
* didn't, then let's create the bus now. */
/* We might have deserialized the kdbus control fd, but if we
* didn't, then let's create the bus now. */
@@
-1033,7
+1032,7
@@
int manager_startup(Manager *m, FILE *serialization, FDSet *fds) {
/* Third, fire things up! */
q = manager_coldplug(m);
/* Third, fire things up! */
q = manager_coldplug(m);
- if (q < 0)
+ if (q < 0
&& r == 0
)
r = q;
if (serialization) {
r = q;
if (serialization) {