X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fautomount.c;h=934aa5f35d78dc83716a56433d0ff3d4e8e28838;hp=262a47da4efe5fdc79b5579b37f5a78968a0d9da;hb=73c33e7f225f81e6066386fba997e8ea2ba361b3;hpb=eb22ac37f3e07b9c49a3f8fdc8cc02631faabcb4 diff --git a/src/automount.c b/src/automount.c index 262a47da4..934aa5f35 100644 --- a/src/automount.c +++ b/src/automount.c @@ -35,12 +35,14 @@ #include "load-dropin.h" #include "unit-name.h" #include "dbus-automount.h" +#include "bus-errors.h" +#include "special.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_MAINTENANCE] = UNIT_MAINTENANCE }; static int open_dev_autofs(Manager *m); @@ -53,6 +55,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) { @@ -87,8 +91,8 @@ static void unmount_autofs(Automount *a) { /* If we reload/reexecute things we keep the mount point * around */ if (a->where && - (UNIT(a)->meta.manager->exit_code != MANAGER_RELOAD && - UNIT(a)->meta.manager->exit_code != MANAGER_REEXECUTE)) + (a->meta.manager->exit_code != MANAGER_RELOAD && + a->meta.manager->exit_code != MANAGER_REEXECUTE)) repeat_unmout(a->where); } @@ -123,10 +127,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; @@ -150,9 +151,14 @@ static int automount_verify(Automount *a) { char *e; assert(a); - if (UNIT(a)->meta.load_state != UNIT_LOADED) + 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; @@ -160,7 +166,7 @@ static int automount_verify(Automount *a) { free(e); if (!b) { - log_error("%s's Where setting doesn't match unit name. Refusing.", UNIT(a)->meta.id); + log_error("%s's Where setting doesn't match unit name. Refusing.", a->meta.id); return -EINVAL; } @@ -194,6 +200,11 @@ 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 && + a->meta.manager->running_as == MANAGER_SYSTEM) + if ((r = unit_add_two_dependencies_by_name(UNIT(a), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET, NULL, true)) < 0) + return r; } return automount_verify(a); @@ -212,7 +223,7 @@ static void automount_set_state(Automount *a, AutomountState state) { if (state != old_state) log_debug("%s changed %s -> %s", - UNIT(a)->meta.id, + a->meta.id, automount_state_to_string(old_state), automount_state_to_string(state)); @@ -253,9 +264,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) { @@ -403,7 +416,7 @@ int automount_send_ready(Automount *a, int status) { if (set_isempty(a->tokens)) return 0; - if ((ioctl_fd = open_ioctl_fd(UNIT(a)->meta.manager->dev_autofs_fd, a->where, a->dev_id)) < 0) { + if ((ioctl_fd = open_ioctl_fd(a->meta.manager->dev_autofs_fd, a->where, a->dev_id)) < 0) { r = ioctl_fd; goto fail; } @@ -422,7 +435,7 @@ int automount_send_ready(Automount *a, int status) { * if you pass a positive status code here, the kernel will * freeze! Yay! */ - if ((k = autofs_send_ready(UNIT(a)->meta.manager->dev_autofs_fd, + if ((k = autofs_send_ready(a->meta.manager->dev_autofs_fd, ioctl_fd, token, status)) < 0) @@ -452,7 +465,7 @@ static void automount_enter_waiting(Automount *a) { if (a->tokens) set_clear(a->tokens); - if ((dev_autofs_fd = open_dev_autofs(UNIT(a)->meta.manager)) < 0) { + if ((dev_autofs_fd = open_dev_autofs(a->meta.manager)) < 0) { r = dev_autofs_fd; goto fail; } @@ -532,21 +545,25 @@ 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) { + 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(UNIT(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 +572,7 @@ static void automount_enter_runnning(Automount *a) { fail: automount_enter_dead(a, false); + dbus_error_free(&error); } static int automount_start(Unit *u) {