a->pipe_watch.type = WATCH_INVALID;
a->directory_mode = 0755;
+
+ a->meta.ignore_on_isolate = true;
}
static void repeat_unmout(const char *path) {
if (a->meta.manager->running_as == MANAGER_SYSTEM) {
- if ((r = unit_add_dependency_by_name(UNIT(a), UNIT_AFTER, SPECIAL_FSCK_TARGET, NULL, true)) < 0)
+ if ((r = unit_add_dependency_by_name(UNIT(a), UNIT_BEFORE, SPECIAL_BASIC_TARGET, NULL, true)) < 0)
return r;
- if ((r = unit_add_two_dependencies_by_name(UNIT(a), UNIT_BEFORE, UNIT_CONFLICTED_BY, SPECIAL_UMOUNT_TARGET, NULL, true)) < 0)
+ if ((r = unit_add_two_dependencies_by_name(UNIT(a), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET, NULL, true)) < 0)
return r;
}
automount_state_to_string(old_state),
automount_state_to_string(state));
- unit_notify(UNIT(a), state_translation_table[old_state], state_translation_table[state]);
+ unit_notify(UNIT(a), state_translation_table[old_state], state_translation_table[state], true);
}
static int automount_coldplug(Unit *u) {
if (m->dev_autofs_fd >= 0)
return m->dev_autofs_fd;
- label_fix("/dev/autofs");
+ label_fix("/dev/autofs", false);
if ((m->dev_autofs_fd = open("/dev/autofs", O_CLOEXEC|O_RDONLY)) < 0) {
log_error("Failed to open /dev/autofs: %s", strerror(errno));
/* We don't take mount requests anymore if we are supposed to
* shut down anyway */
- if (a->meta.job && a->meta.job->type == JOB_STOP) {
+ if (unit_pending_inactive(UNIT(a))) {
+ log_debug("Suppressing automount request on %s since unit stop is scheduled.", a->meta.id);
automount_send_ready(a, -EHOSTDOWN);
return;
}
/* Before we do anything, let's see if somebody is playing games with us? */
if (lstat(a->where, &st) < 0) {
- log_warning("%s failed stat automount point: %m", a->meta.id);
+ log_warning("%s failed to stat automount point: %m", a->meta.id);
goto fail;
}
switch (packet.hdr.type) {
case autofs_ptype_missing_direct:
- log_debug("Got direct mount request for %s", packet.v5_packet.name);
+
+ if (packet.v5_packet.pid > 0) {
+ char *p = NULL;
+
+ get_process_name(packet.v5_packet.pid, &p);
+ log_debug("Got direct mount request for %s, triggered by %lu (%s)", packet.v5_packet.name, (unsigned long) packet.v5_packet.pid, strna(p));
+ free(p);
+
+ } else
+ log_debug("Got direct mount request for %s", packet.v5_packet.name);
if (!a->tokens)
if (!(a->tokens = set_new(trivial_hash_func, trivial_compare_func))) {