chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
socket: don't close sockets when activating per-connection units
[elogind.git]
/
src
/
path.c
diff --git
a/src/path.c
b/src/path.c
index 8a940d0262d617657e2cfa213a133aa46f571512..2ae6e569ce93b88c0c250d39325c045bfd3c79a1 100644
(file)
--- a/
src/path.c
+++ b/
src/path.c
@@
-29,12
+29,14
@@
#include "unit-name.h"
#include "path.h"
#include "dbus-path.h"
#include "unit-name.h"
#include "path.h"
#include "dbus-path.h"
+#include "special.h"
+#include "bus-errors.h"
static const UnitActiveState state_translation_table[_PATH_STATE_MAX] = {
[PATH_DEAD] = UNIT_INACTIVE,
[PATH_WAITING] = UNIT_ACTIVE,
[PATH_RUNNING] = UNIT_ACTIVE,
static const UnitActiveState state_translation_table[_PATH_STATE_MAX] = {
[PATH_DEAD] = UNIT_INACTIVE,
[PATH_WAITING] = UNIT_ACTIVE,
[PATH_RUNNING] = UNIT_ACTIVE,
- [PATH_MAINTENANCE] = UNIT_
INACTIV
E
+ [PATH_MAINTENANCE] = UNIT_
MAINTENANC
E
};
static void path_done(Unit *u) {
};
static void path_done(Unit *u) {
@@
-65,10
+67,7
@@
int path_add_one_mount_link(Path *p, Mount *m) {
if (!path_startswith(s->path, m->where))
continue;
if (!path_startswith(s->path, m->where))
continue;
- if ((r = unit_add_dependency(UNIT(m), UNIT_BEFORE, UNIT(p), true)) < 0)
- return r;
-
- if ((r = unit_add_dependency(UNIT(p), UNIT_REQUIRES, UNIT(m), true)) < 0)
+ if ((r = unit_add_two_dependencies(UNIT(p), UNIT_AFTER, UNIT_REQUIRES, UNIT(m), true)) < 0)
return r;
}
return r;
}
@@
-91,7
+90,7
@@
static int path_add_mount_links(Path *p) {
static int path_verify(Path *p) {
assert(p);
static int path_verify(Path *p) {
assert(p);
- if (
UNIT(p)
->meta.load_state != UNIT_LOADED)
+ if (
p
->meta.load_state != UNIT_LOADED)
return 0;
if (!p->specs) {
return 0;
if (!p->specs) {
@@
-123,6
+122,11
@@
static int path_load(Unit *u) {
if ((r = path_add_mount_links(p)) < 0)
return r;
if ((r = path_add_mount_links(p)) < 0)
return r;
+
+ /* Path units shouldn't stay around on shutdown */
+ if (p->meta.default_dependencies)
+ if ((r = unit_add_two_dependencies_by_name(u, UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_SHUTDOWN_TARGET, NULL, true)) < 0)
+ return r;
}
return path_verify(p);
}
return path_verify(p);
@@
-295,17
+299,26
@@
static void path_enter_dead(Path *p, bool success) {
static void path_enter_running(Path *p) {
int r;
static void path_enter_running(Path *p) {
int r;
+ DBusError error;
+
assert(p);
assert(p);
+ dbus_error_init(&error);
+
+ /* Don't start job if we are supposed to go down */
+ if (p->meta.job && p->meta.job->type == JOB_STOP)
+ return;
- if ((r = manager_add_job(
UNIT(p)->meta.manager, JOB_START, p->unit, JOB_REPLACE, true
, NULL)) < 0)
+ if ((r = manager_add_job(
p->meta.manager, JOB_START, p->unit, JOB_REPLACE, true, &error
, NULL)) < 0)
goto fail;
path_set_state(p, PATH_RUNNING);
return;
fail:
goto fail;
path_set_state(p, PATH_RUNNING);
return;
fail:
- log_warning("%s failed to queue unit startup job: %s", p->meta.id,
strerror(-
r));
+ log_warning("%s failed to queue unit startup job: %s", p->meta.id,
bus_error(&error,
r));
path_enter_dead(p, false);
path_enter_dead(p, false);
+
+ dbus_error_free(&error);
}
}