chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
systemctl: show whether we follow somebody in 'status' output
[elogind.git]
/
src
/
path.c
diff --git
a/src/path.c
b/src/path.c
index a9fa3771ab0454786a9a1b3326de1f4ba3d8b548..92f99381e85a992e975eb9a04e28a73c3677637c 100644
(file)
--- a/
src/path.c
+++ b/
src/path.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.
@@
-36,7
+36,7
@@
static const UnitActiveState state_translation_table[_PATH_STATE_MAX] = {
[PATH_DEAD] = UNIT_INACTIVE,
[PATH_WAITING] = UNIT_ACTIVE,
[PATH_RUNNING] = UNIT_ACTIVE,
[PATH_DEAD] = UNIT_INACTIVE,
[PATH_WAITING] = UNIT_ACTIVE,
[PATH_RUNNING] = UNIT_ACTIVE,
- [PATH_
MAINTENANCE] = UNIT_MAINTENANCE
+ [PATH_
FAILED] = UNIT_FAILED
};
static void path_done(Unit *u) {
};
static void path_done(Unit *u) {
@@
-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) {
@@
-145,12
+145,10
@@
static int path_load(Unit *u) {
static void path_dump(Unit *u, FILE *f, const char *prefix) {
Path *p = PATH(u);
static void path_dump(Unit *u, FILE *f, const char *prefix) {
Path *p = PATH(u);
- const char *prefix2;
- char *p2;
PathSpec *s;
PathSpec *s;
-
p2 = strappend(prefix, "\t"
);
-
prefix2 = p2 ? p2 : prefix
;
+
assert(p
);
+
assert(f)
;
fprintf(f,
"%sPath State: %s\n"
fprintf(f,
"%sPath State: %s\n"
@@
-164,8
+162,6
@@
static void path_dump(Unit *u, FILE *f, const char *prefix) {
prefix,
path_type_to_string(s->type),
s->path);
prefix,
path_type_to_string(s->type),
s->path);
-
- free(p2);
}
static void path_unwatch_one(Path *p, PathSpec *s) {
}
static void path_unwatch_one(Path *p, PathSpec *s) {
@@
-305,7
+301,7
@@
static void path_enter_dead(Path *p, bool success) {
if (!success)
p->failure = true;
if (!success)
p->failure = true;
- path_set_state(p, p->failure ? PATH_
MAINTENANCE
: PATH_DEAD);
+ path_set_state(p, p->failure ? PATH_
FAILED
: PATH_DEAD);
}
static void path_enter_running(Path *p) {
}
static void path_enter_running(Path *p) {
@@
-387,13
+383,14
@@
static int path_start(Unit *u) {
Path *p = PATH(u);
assert(p);
Path *p = PATH(u);
assert(p);
- assert(p->state == PATH_DEAD || p->state == PATH_
MAINTENANCE
);
+ assert(p->state == PATH_DEAD || p->state == PATH_
FAILED
);
if (p->unit->meta.load_state != UNIT_LOADED)
return -ENOENT;
p->failure = false;
if (p->unit->meta.load_state != UNIT_LOADED)
return -ENOENT;
p->failure = false;
-path_enter_waiting(p, true);
+ path_enter_waiting(p, true);
+
return 0;
}
return 0;
}
@@
-560,11
+557,22
@@
fail:
log_error("Failed find path unit: %s", strerror(-r));
}
log_error("Failed find path unit: %s", strerror(-r));
}
+static void path_reset_failed(Unit *u) {
+ Path *p = PATH(u);
+
+ assert(p);
+
+ if (p->state == PATH_FAILED)
+ 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",
[PATH_RUNNING] = "running",
static const char* const path_state_table[_PATH_STATE_MAX] = {
[PATH_DEAD] = "dead",
[PATH_WAITING] = "waiting",
[PATH_RUNNING] = "running",
- [PATH_
MAINTENANCE] = "maintenance
"
+ [PATH_
FAILED] = "failed
"
};
DEFINE_STRING_TABLE_LOOKUP(path_state, PathState);
};
DEFINE_STRING_TABLE_LOOKUP(path_state, PathState);
@@
-598,5
+606,8
@@
const UnitVTable path_vtable = {
.fd_event = path_fd_event,
.fd_event = path_fd_event,
+ .reset_failed = path_reset_failed,
+
+ .bus_interface = "org.freedesktop.systemd1.Path",
.bus_message_handler = bus_path_message_handler
};
.bus_message_handler = bus_path_message_handler
};