chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journalctl: suppress messages about adm group if ACL support is not enabled
[elogind.git]
/
src
/
path.c
diff --git
a/src/path.c
b/src/path.c
index bfb5cdf0a507c5345d6334799356fd26d0a05e0d..e97cd0981097a51255fd70055f824a9d32e10c58 100644
(file)
--- a/
src/path.c
+++ b/
src/path.c
@@
-264,8
+264,8
@@
int path_add_one_mount_link(Path *p, Mount *m) {
assert(p);
assert(m);
assert(p);
assert(m);
- if (
p->meta.
load_state != UNIT_LOADED ||
-
m->meta.
load_state != UNIT_LOADED)
+ if (
UNIT(p)->
load_state != UNIT_LOADED ||
+
UNIT(m)->
load_state != UNIT_LOADED)
return 0;
LIST_FOREACH(spec, s, p->specs) {
return 0;
LIST_FOREACH(spec, s, p->specs) {
@@
-286,8
+286,8
@@
static int path_add_mount_links(Path *p) {
assert(p);
assert(p);
- LIST_FOREACH(units_by_type, other,
p->meta.
manager->units_by_type[UNIT_MOUNT])
- if ((r = path_add_one_mount_link(p,
(Mount*) other
)) < 0)
+ LIST_FOREACH(units_by_type, other,
UNIT(p)->
manager->units_by_type[UNIT_MOUNT])
+ if ((r = path_add_one_mount_link(p,
MOUNT(other)
)) < 0)
return r;
return 0;
return r;
return 0;
@@
-296,11
+296,11
@@
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 (
p->meta.
load_state != UNIT_LOADED)
+ if (
UNIT(p)->
load_state != UNIT_LOADED)
return 0;
if (!p->specs) {
return 0;
if (!p->specs) {
- log_error("%s lacks path setting. Refusing.",
p->meta.
id);
+ log_error("%s lacks path setting. Refusing.",
UNIT(p)->
id);
return -EINVAL;
}
return -EINVAL;
}
@@
-312,7
+312,7
@@
static int path_add_default_dependencies(Path *p) {
assert(p);
assert(p);
- if (
p->meta.
manager->running_as == MANAGER_SYSTEM) {
+ if (
UNIT(p)->
manager->running_as == MANAGER_SYSTEM) {
if ((r = unit_add_dependency_by_name(UNIT(p), UNIT_BEFORE, SPECIAL_BASIC_TARGET, NULL, true)) < 0)
return r;
if ((r = unit_add_dependency_by_name(UNIT(p), UNIT_BEFORE, SPECIAL_BASIC_TARGET, NULL, true)) < 0)
return r;
@@
-352,7
+352,7
@@
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;
- if (
p->meta.
default_dependencies)
+ if (
UNIT(p)->
default_dependencies)
if ((r = path_add_default_dependencies(p)) < 0)
return r;
}
if ((r = path_add_default_dependencies(p)) < 0)
return r;
}
@@
-369,10
+369,12
@@
static void path_dump(Unit *u, FILE *f, const char *prefix) {
fprintf(f,
"%sPath State: %s\n"
fprintf(f,
"%sPath State: %s\n"
+ "%sResult: %s\n"
"%sUnit: %s\n"
"%sMakeDirectory: %s\n"
"%sDirectoryMode: %04o\n",
prefix, path_state_to_string(p->state),
"%sUnit: %s\n"
"%sMakeDirectory: %s\n"
"%sDirectoryMode: %04o\n",
prefix, path_state_to_string(p->state),
+ prefix, path_result_to_string(p->result),
prefix, UNIT_DEREF(p->unit)->id,
prefix, yes_no(p->make_directory),
prefix, p->directory_mode);
prefix, UNIT_DEREF(p->unit)->id,
prefix, yes_no(p->make_directory),
prefix, p->directory_mode);
@@
-416,7
+418,7
@@
static void path_set_state(Path *p, PathState state) {
if (state != old_state)
log_debug("%s changed %s -> %s",
if (state != old_state)
log_debug("%s changed %s -> %s",
-
p->meta.
id,
+
UNIT(p)->
id,
path_state_to_string(old_state),
path_state_to_string(state));
path_state_to_string(old_state),
path_state_to_string(state));
@@
-443,13
+445,13
@@
static int path_coldplug(Unit *u) {
return 0;
}
return 0;
}
-static void path_enter_dead(Path *p,
bool success
) {
+static void path_enter_dead(Path *p,
PathResult f
) {
assert(p);
assert(p);
- if (
!success
)
- p->
failure = true
;
+ if (
f != PATH_SUCCESS
)
+ p->
result = f
;
- path_set_state(p, p->
failure
? PATH_FAILED : PATH_DEAD);
+ path_set_state(p, p->
result != PATH_SUCCESS
? PATH_FAILED : PATH_DEAD);
}
static void path_enter_running(Path *p) {
}
static void path_enter_running(Path *p) {
@@
-460,10
+462,10
@@
static void path_enter_running(Path *p) {
dbus_error_init(&error);
/* Don't start job if we are supposed to go down */
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)
+ if (
UNIT(p)->job && UNIT(p)->
job->type == JOB_STOP)
return;
return;
- if ((r = manager_add_job(
p->meta.
manager, JOB_START, UNIT_DEREF(p->unit), JOB_REPLACE, true, &error, NULL)) < 0)
+ if ((r = manager_add_job(
UNIT(p)->
manager, JOB_START, UNIT_DEREF(p->unit), JOB_REPLACE, true, &error, NULL)) < 0)
goto fail;
p->inotify_triggered = false;
goto fail;
p->inotify_triggered = false;
@@
-475,8
+477,8
@@
static void path_enter_running(Path *p) {
return;
fail:
return;
fail:
- log_warning("%s failed to queue unit startup job: %s",
p->meta.
id, bus_error(&error, r));
- path_enter_dead(p,
false
);
+ log_warning("%s failed to queue unit startup job: %s",
UNIT(p)->
id, bus_error(&error, r));
+ path_enter_dead(p,
PATH_FAILURE_RESOURCES
);
dbus_error_free(&error);
}
dbus_error_free(&error);
}
@@
-502,7
+504,7
@@
static void path_enter_waiting(Path *p, bool initial, bool recheck) {
if (recheck)
if (path_check_good(p, initial)) {
if (recheck)
if (path_check_good(p, initial)) {
- log_debug("%s got triggered.",
p->meta.
id);
+ log_debug("%s got triggered.",
UNIT(p)->
id);
path_enter_running(p);
return;
}
path_enter_running(p);
return;
}
@@
-516,7
+518,7
@@
static void path_enter_waiting(Path *p, bool initial, bool recheck) {
if (recheck)
if (path_check_good(p, false)) {
if (recheck)
if (path_check_good(p, false)) {
- log_debug("%s got triggered.",
p->meta.
id);
+ log_debug("%s got triggered.",
UNIT(p)->
id);
path_enter_running(p);
return;
}
path_enter_running(p);
return;
}
@@
-525,8
+527,8
@@
static void path_enter_waiting(Path *p, bool initial, bool recheck) {
return;
fail:
return;
fail:
- log_warning("%s failed to enter waiting state: %s",
p->meta.
id, strerror(-r));
- path_enter_dead(p,
false
);
+ log_warning("%s failed to enter waiting state: %s",
UNIT(p)->
id, strerror(-r));
+ path_enter_dead(p,
PATH_FAILURE_RESOURCES
);
}
static void path_mkdir(Path *p) {
}
static void path_mkdir(Path *p) {
@@
-552,7
+554,7
@@
static int path_start(Unit *u) {
path_mkdir(p);
path_mkdir(p);
- p->
failure = false
;
+ p->
result = PATH_SUCCESS
;
path_enter_waiting(p, true, true);
return 0;
path_enter_waiting(p, true, true);
return 0;
@@
-564,7
+566,7
@@
static int path_stop(Unit *u) {
assert(p);
assert(p->state == PATH_WAITING || p->state == PATH_RUNNING);
assert(p);
assert(p->state == PATH_WAITING || p->state == PATH_RUNNING);
- path_enter_dead(p,
true
);
+ path_enter_dead(p,
PATH_SUCCESS
);
return 0;
}
return 0;
}
@@
-576,6
+578,7
@@
static int path_serialize(Unit *u, FILE *f, FDSet *fds) {
assert(fds);
unit_serialize_item(u, f, "state", path_state_to_string(p->state));
assert(fds);
unit_serialize_item(u, f, "state", path_state_to_string(p->state));
+ unit_serialize_item(u, f, "result", path_result_to_string(p->result));
return 0;
}
return 0;
}
@@
-595,6
+598,16
@@
static int path_deserialize_item(Unit *u, const char *key, const char *value, FD
log_debug("Failed to parse state value %s", value);
else
p->deserialized_state = state;
log_debug("Failed to parse state value %s", value);
else
p->deserialized_state = state;
+
+ } else if (streq(key, "result")) {
+ PathResult f;
+
+ f = path_result_from_string(value);
+ if (f < 0)
+ log_debug("Failed to parse result value %s", value);
+ else if (f != PATH_SUCCESS)
+ p->result = f;
+
} else
log_debug("Unknown serialization key '%s'", key);
} else
log_debug("Unknown serialization key '%s'", key);
@@
-653,7
+666,7
@@
static void path_fd_event(Unit *u, int fd, uint32_t events, Watch *w) {
return;
fail:
return;
fail:
- path_enter_dead(p,
false
);
+ path_enter_dead(p,
PATH_FAILURE_RESOURCES
);
}
void path_unit_notify(Unit *u, UnitActiveState new_state) {
}
void path_unit_notify(Unit *u, UnitActiveState new_state) {
@@
-675,7
+688,7
@@
void path_unit_notify(Unit *u, UnitActiveState new_state) {
p = PATH(k);
if (p->state == PATH_RUNNING && new_state == UNIT_INACTIVE) {
p = PATH(k);
if (p->state == PATH_RUNNING && new_state == UNIT_INACTIVE) {
- log_debug("%s got notified about unit deactivation.",
p->meta.
id);
+ log_debug("%s got notified about unit deactivation.",
UNIT(p)->
id);
/* Hmm, so inotify was triggered since the
* last activation, so I guess we need to
/* Hmm, so inotify was triggered since the
* last activation, so I guess we need to
@@
-693,7
+706,7
@@
static void path_reset_failed(Unit *u) {
if (p->state == PATH_FAILED)
path_set_state(p, PATH_DEAD);
if (p->state == PATH_FAILED)
path_set_state(p, PATH_DEAD);
- p->
failure = false
;
+ p->
result = PATH_SUCCESS
;
}
static const char* const path_state_table[_PATH_STATE_MAX] = {
}
static const char* const path_state_table[_PATH_STATE_MAX] = {
@@
-715,6
+728,13
@@
static const char* const path_type_table[_PATH_TYPE_MAX] = {
DEFINE_STRING_TABLE_LOOKUP(path_type, PathType);
DEFINE_STRING_TABLE_LOOKUP(path_type, PathType);
+static const char* const path_result_table[_PATH_RESULT_MAX] = {
+ [PATH_SUCCESS] = "success",
+ [PATH_FAILURE_RESOURCES] = "resources"
+};
+
+DEFINE_STRING_TABLE_LOOKUP(path_result, PathResult);
+
const UnitVTable path_vtable = {
.suffix = ".path",
.object_size = sizeof(Path),
const UnitVTable path_vtable = {
.suffix = ".path",
.object_size = sizeof(Path),
@@
-745,5
+765,6
@@
const UnitVTable path_vtable = {
.reset_failed = path_reset_failed,
.bus_interface = "org.freedesktop.systemd1.Path",
.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,
+ .bus_invalidating_properties = bus_path_invalidating_properties
};
};