X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fautomount.c;h=da66630fd6b083bc2e1bc769ffdce0b6ec8b1926;hp=75c10538b7dd4bcc55f26902d6cbd8f9d45de0ef;hb=941a4041bdb9d91e9d5033005263efe029621e4f;hpb=4cd1fbcc0648a289e9bf9d9047621bbdf7ec0ece diff --git a/src/automount.c b/src/automount.c index 75c10538b..da66630fd 100644 --- a/src/automount.c +++ b/src/automount.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. @@ -35,12 +35,15 @@ #include "load-dropin.h" #include "unit-name.h" #include "dbus-automount.h" +#include "bus-errors.h" +#include "special.h" +#include "label.h" static const UnitActiveState state_translation_table[_AUTOMOUNT_STATE_MAX] = { [AUTOMOUNT_DEAD] = UNIT_INACTIVE, [AUTOMOUNT_WAITING] = UNIT_ACTIVE, [AUTOMOUNT_RUNNING] = UNIT_ACTIVE, - [AUTOMOUNT_MAINTENANCE] = UNIT_INACTIVE, + [AUTOMOUNT_FAILED] = UNIT_FAILED }; static int open_dev_autofs(Manager *m); @@ -53,6 +56,8 @@ static void automount_init(Unit *u) { a->pipe_watch.fd = a->pipe_fd = -1; a->pipe_watch.type = WATCH_INVALID; + + a->directory_mode = 0755; } static void repeat_unmout(const char *path) { @@ -123,10 +128,7 @@ int automount_add_one_mount_link(Automount *a, Mount *m) { if (path_equal(a->where, m->where)) return 0; - if ((r = unit_add_dependency(UNIT(m), UNIT_BEFORE, UNIT(a), true)) < 0) - return r; - - if ((r = unit_add_dependency(UNIT(a), UNIT_REQUIRES, UNIT(m), true)) < 0) + if ((r = unit_add_two_dependencies(UNIT(a), UNIT_AFTER, UNIT_REQUIRES, UNIT(m), true)) < 0) return r; return 0; @@ -145,6 +147,20 @@ static int automount_add_mount_links(Automount *a) { return 0; } +static int automount_add_default_dependencies(Automount *a) { + int r; + + assert(a); + + if (a->meta.manager->running_as == MANAGER_SYSTEM) { + + if ((r = unit_add_two_dependencies_by_name(UNIT(a), UNIT_BEFORE, UNIT_CONFLICTED_BY, SPECIAL_UMOUNT_TARGET, NULL, true)) < 0) + return r; + } + + return 0; +} + static int automount_verify(Automount *a) { bool b; char *e; @@ -153,6 +169,11 @@ static int automount_verify(Automount *a) { if (a->meta.load_state != UNIT_LOADED) return 0; + if (path_equal(a->where, "/")) { + log_error("Cannot have an automount unit for the root directory. Refusing."); + return -EINVAL; + } + if (!(e = unit_name_from_path(a->where, ".automount"))) return -ENOMEM; @@ -194,6 +215,10 @@ static int automount_load(Unit *u) { if ((r = unit_add_dependency(u, UNIT_BEFORE, UNIT(a->mount), true)) < 0) return r; + + if (a->meta.default_dependencies) + if ((r = automount_add_default_dependencies(a)) < 0) + return r; } return automount_verify(a); @@ -253,9 +278,11 @@ static void automount_dump(Unit *u, FILE *f, const char *prefix) { fprintf(f, "%sAutomount State: %s\n" - "%sWhere: %s\n", + "%sWhere: %s\n" + "%sDirectoryMode: %04o\n", prefix, automount_state_to_string(a->state), - prefix, a->where); + prefix, a->where, + prefix, a->directory_mode); } static void automount_enter_dead(Automount *a, bool success) { @@ -264,7 +291,7 @@ static void automount_enter_dead(Automount *a, bool success) { if (!success) a->failure = true; - automount_set_state(a, a->failure ? AUTOMOUNT_MAINTENANCE : AUTOMOUNT_DEAD); + automount_set_state(a, a->failure ? AUTOMOUNT_FAILED : AUTOMOUNT_DEAD); } static int open_dev_autofs(Manager *m) { @@ -275,6 +302,8 @@ static int open_dev_autofs(Manager *m) { if (m->dev_autofs_fd >= 0) return m->dev_autofs_fd; + label_fix("/dev/autofs"); + if ((m->dev_autofs_fd = open("/dev/autofs", O_CLOEXEC|O_RDONLY)) < 0) { log_error("Failed to open /dev/autofs: %s", strerror(errno)); return -errno; @@ -413,6 +442,8 @@ int automount_send_ready(Automount *a, int status) { else log_debug("Sending success."); + r = 0; + /* Autofs thankfully does not hand out 0 as a token */ while ((token = PTR_TO_UINT(set_steal_first(a->tokens)))) { int k; @@ -429,8 +460,6 @@ int automount_send_ready(Automount *a, int status) { r = k; } - r = 0; - fail: if (ioctl_fd >= 0) close_nointr_nofail(ioctl_fd); @@ -532,21 +561,32 @@ fail: static void automount_enter_runnning(Automount *a) { int r; struct stat st; + DBusError error; assert(a); assert(a->mount); - /* Before we do anything, let's see if somebody is playing games with us? */ + dbus_error_init(&error); - if (stat(a->where, &st) < 0) { + /* 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) { + automount_send_ready(a, -EHOSTDOWN); + return; + } + + mkdir_p(a->where, a->directory_mode); + + /* 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); goto fail; } if (!S_ISDIR(st.st_mode) || st.st_dev != a->dev_id) log_info("%s's automount point already active?", a->meta.id); - else if ((r = manager_add_job(a->meta.manager, JOB_START, UNIT(a->mount), JOB_REPLACE, true, NULL)) < 0) { - log_warning("%s failed to queue mount startup job: %s", a->meta.id, strerror(-r)); + else if ((r = manager_add_job(a->meta.manager, JOB_START, UNIT(a->mount), JOB_REPLACE, true, &error, NULL)) < 0) { + log_warning("%s failed to queue mount startup job: %s", a->meta.id, bus_error(&error, r)); goto fail; } @@ -555,6 +595,7 @@ static void automount_enter_runnning(Automount *a) { fail: automount_enter_dead(a, false); + dbus_error_free(&error); } static int automount_start(Unit *u) { @@ -562,7 +603,7 @@ static int automount_start(Unit *u) { assert(a); - assert(a->state == AUTOMOUNT_DEAD || a->state == AUTOMOUNT_MAINTENANCE); + assert(a->state == AUTOMOUNT_DEAD || a->state == AUTOMOUNT_FAILED); if (path_is_mount_point(a->where)) { log_error("Path %s is already a mount point, refusing start for %s", a->where, u->meta.id); @@ -691,6 +732,9 @@ static bool automount_check_gc(Unit *u) { assert(a); + if (!a->mount) + return false; + return UNIT_VTABLE(UNIT(a->mount))->check_gc(UNIT(a->mount)); } @@ -716,7 +760,16 @@ static void automount_fd_event(Unit *u, int fd, uint32_t events, Watch *w) { 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))) { @@ -750,11 +803,22 @@ static void automount_shutdown(Manager *m) { close_nointr_nofail(m->dev_autofs_fd); } +static void automount_reset_failed(Unit *u) { + Automount *a = AUTOMOUNT(u); + + assert(a); + + if (a->state == AUTOMOUNT_FAILED) + automount_set_state(a, AUTOMOUNT_DEAD); + + a->failure = false; +} + static const char* const automount_state_table[_AUTOMOUNT_STATE_MAX] = { [AUTOMOUNT_DEAD] = "dead", [AUTOMOUNT_WAITING] = "waiting", [AUTOMOUNT_RUNNING] = "running", - [AUTOMOUNT_MAINTENANCE] = "maintenance" + [AUTOMOUNT_FAILED] = "failed" }; DEFINE_STRING_TABLE_LOOKUP(automount_state, AutomountState); @@ -786,6 +850,9 @@ const UnitVTable automount_vtable = { .fd_event = automount_fd_event, + .reset_failed = automount_reset_failed, + + .bus_interface = "org.freedesktop.systemd1.Automount", .bus_message_handler = bus_automount_message_handler, .shutdown = automount_shutdown