/* The stdio/kmsg bridge socket is on /, in order to avoid a
* dep loop, don't use kmsg logging for -.mount */
- if (!unit_has_name(u, "-.mount"))
- m->exec_context.std_output = EXEC_OUTPUT_KMSG;
+ if (!unit_has_name(u, "-.mount")) {
+ m->exec_context.std_output = u->meta.manager->default_std_output;
+ m->exec_context.std_error = u->meta.manager->default_std_error;
+ }
/* We need to make sure that /bin/mount is always called in
* the same process group as us, so that the autofs kernel
static void mount_done(Unit *u) {
Mount *m = MOUNT(u);
- Meta *other;
assert(m);
free(m->where);
m->where = NULL;
- /* Try to detach us from the automount unit if there is any */
- LIST_FOREACH(units_by_type, other, m->meta.manager->units_by_type[UNIT_AUTOMOUNT]) {
- Automount *a = (Automount*) other;
-
- if (a->mount == m)
- a->mount = NULL;
- }
-
mount_parameters_done(&m->parameters_etc_fstab);
mount_parameters_done(&m->parameters_proc_self_mountinfo);
mount_parameters_done(&m->parameters_fragment);
after = SPECIAL_LOCAL_FS_PRE_TARGET;
}
- if (!path_equal(m->where, "/"))
- if ((r = unit_add_two_dependencies_by_name(UNIT(m), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET, NULL, true)) < 0)
- return r;
-
if ((r = manager_load_unit(m->meta.manager, target, NULL, NULL, &tu)) < 0)
return r;
static int mount_add_default_dependencies(Mount *m) {
int r;
+ MountParameters *p;
assert(m);
- if (m->meta.manager->running_as == MANAGER_SYSTEM &&
- !path_equal(m->where, "/")) {
- MountParameters *p;
-
- p = get_mount_parameters_configured(m);
+ if (m->meta.manager->running_as != MANAGER_SYSTEM)
+ return 0;
- if (p && needs_quota(p)) {
- if ((r = unit_add_two_dependencies_by_name(UNIT(m), UNIT_BEFORE, UNIT_WANTS, SPECIAL_QUOTACHECK_SERVICE, NULL, true)) < 0 ||
- (r = unit_add_two_dependencies_by_name(UNIT(m), UNIT_BEFORE, UNIT_WANTS, SPECIAL_QUOTAON_SERVICE, NULL, true)) < 0)
- return r;
- }
+ p = get_mount_parameters_configured(m);
+ if (p && needs_quota(p)) {
+ if ((r = unit_add_two_dependencies_by_name(UNIT(m), UNIT_BEFORE, UNIT_WANTS, SPECIAL_QUOTACHECK_SERVICE, NULL, true)) < 0 ||
+ (r = unit_add_two_dependencies_by_name(UNIT(m), UNIT_BEFORE, UNIT_WANTS, SPECIAL_QUOTAON_SERVICE, NULL, true)) < 0)
+ return r;
+ }
+ if (!path_equal(m->where, "/"))
if ((r = unit_add_two_dependencies_by_name(UNIT(m), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET, NULL, true)) < 0)
return r;
- }
return 0;
}
if (m->meta.fragment_path)
m->from_fragment = true;
- else if (m->from_etc_fstab)
- m->meta.default_dependencies = false;
if (!m->where)
if (!(m->where = unit_name_to_path(u->meta.id)))
static int mount_notify_automount(Mount *m, int status) {
Unit *p;
int r;
+ Iterator i;
assert(m);
- if ((r = unit_get_related_unit(UNIT(m), ".automount", &p)) < 0)
- return r == -ENOENT ? 0 : r;
+ SET_FOREACH(p, m->meta.dependencies[UNIT_TRIGGERED_BY], i)
+ if (p->meta.type == UNIT_AUTOMOUNT) {
+ r = automount_send_ready(AUTOMOUNT(p), status);
+ if (r < 0)
+ return r;
+ }
- return automount_send_ready(AUTOMOUNT(p), status);
+ return 0;
}
static void mount_set_state(Mount *m, MountState state) {