#include "load-dropin.h"
#include "unit-name.h"
#include "dbus-automount.h"
+#include "bus-errors.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);
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 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);
}
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;
char *e;
assert(a);
- if (UNIT(a)->meta.load_state != UNIT_LOADED)
+ if (a->meta.load_state != UNIT_LOADED)
return 0;
if (!(e = unit_name_from_path(a->where, ".automount")))
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;
}
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));
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) {
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;
}
* 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)
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;
}
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;
}
fail:
automount_enter_dead(a, false);
+ dbus_error_free(&error);
}
static int automount_start(Unit *u) {