#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,
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) {
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;
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;
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);
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) {
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(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;
}
fail:
automount_enter_dead(a, false);
+ dbus_error_free(&error);
}
static int automount_start(Unit *u) {