core: try to continue if coldplugging of a unit fails

This commit is contained in:
Lennart Poettering
2015-11-10 21:03:49 +01:00
parent ba64af90ec
commit 5a6158b641
+9 -10
View File
@@ -2890,7 +2890,7 @@ int unit_add_node_link(Unit *u, const char *what, bool wants) {
}
int unit_coldplug(Unit *u) {
int r;
int r = 0, q = 0;
assert(u);
@@ -2901,17 +2901,16 @@ int unit_coldplug(Unit *u) {
u->coldplugged = true;
if (UNIT_VTABLE(u)->coldplug) {
if (UNIT_VTABLE(u)->coldplug)
r = UNIT_VTABLE(u)->coldplug(u);
if (r < 0)
return r;
}
if (u->job) {
r = job_coldplug(u->job);
if (r < 0)
return r;
}
if (u->job)
q = job_coldplug(u->job);
if (r < 0)
return r;
if (q < 0)
return q;
return 0;
}