chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util: when replacing env vars replace unset envvars by nothing
[elogind.git]
/
src
/
path.c
diff --git
a/src/path.c
b/src/path.c
index a9fa3771ab0454786a9a1b3326de1f4ba3d8b548..91de56f34ce44b5eff881a9428eedff1df9a20dd 100644
(file)
--- a/
src/path.c
+++ b/
src/path.c
@@
-110,7
+110,7
@@
static int path_add_default_dependencies(Path *p) {
if ((r = unit_add_two_dependencies_by_name(UNIT(p), UNIT_AFTER, UNIT_REQUIRES, SPECIAL_SYSINIT_TARGET, NULL, true)) < 0)
return r;
if ((r = unit_add_two_dependencies_by_name(UNIT(p), UNIT_AFTER, UNIT_REQUIRES, SPECIAL_SYSINIT_TARGET, NULL, true)) < 0)
return r;
- return unit_add_two_dependencies_by_name(UNIT(p), UNIT_BEFORE, UNIT_CONFLICT
S
, SPECIAL_SHUTDOWN_TARGET, NULL, true);
+ return unit_add_two_dependencies_by_name(UNIT(p), UNIT_BEFORE, UNIT_CONFLICT
ED_BY
, SPECIAL_SHUTDOWN_TARGET, NULL, true);
}
static int path_load(Unit *u) {
}
static int path_load(Unit *u) {
@@
-560,6
+560,17
@@
fail:
log_error("Failed find path unit: %s", strerror(-r));
}
log_error("Failed find path unit: %s", strerror(-r));
}
+static void path_reset_maintenance(Unit *u) {
+ Path *p = PATH(u);
+
+ assert(p);
+
+ if (p->state == PATH_MAINTENANCE)
+ path_set_state(p, PATH_DEAD);
+
+ p->failure = false;
+}
+
static const char* const path_state_table[_PATH_STATE_MAX] = {
[PATH_DEAD] = "dead",
[PATH_WAITING] = "waiting",
static const char* const path_state_table[_PATH_STATE_MAX] = {
[PATH_DEAD] = "dead",
[PATH_WAITING] = "waiting",
@@
-598,5
+609,7
@@
const UnitVTable path_vtable = {
.fd_event = path_fd_event,
.fd_event = path_fd_event,
+ .reset_maintenance = path_reset_maintenance,
+
.bus_message_handler = bus_path_message_handler
};
.bus_message_handler = bus_path_message_handler
};