X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fmount.c;h=b49443ced11b962e8d930049647ca49cf3b009f0;hp=50fe85cb7c309c69a1346645175bd194fc0f92a3;hb=3006982d93e92019dd6d94a7518684593b43a05e;hpb=398ef8ba0266cca453d90a90b3a2aa1caa44189f diff --git a/src/mount.c b/src/mount.c index 50fe85cb7..b49443ced 100644 --- a/src/mount.c +++ b/src/mount.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. @@ -60,10 +60,10 @@ static void mount_init(Unit *u) { assert(u->meta.load_state == UNIT_STUB); m->timeout_usec = DEFAULT_TIMEOUT_USEC; - exec_context_init(&m->exec_context); - m->directory_mode = 0755; + exec_context_init(&m->exec_context); + /* We need to make sure that /bin/mount is always called in * the same process group as us, so that the autofs kernel * side doesn't send us another mount request while we are @@ -244,7 +244,8 @@ static int mount_add_target_links(Mount *m) { noauto = !!mount_test_option(p->options, MNTOPT_NOAUTO); user = mount_test_option(p->options, "user") || mount_test_option(p->options, "users"); - handle = !!mount_test_option(p->options, "comment=systemd.mount"); + handle = !!mount_test_option(p->options, "comment=systemd.mount") || + m->meta.manager->mount_auto; automount = !!mount_test_option(p->options, "comment=systemd.automount"); if (mount_test_option(p->options, "_netdev") || @@ -274,6 +275,24 @@ static int mount_add_target_links(Mount *m) { } } +static int mount_add_default_dependencies(Mount *m) { + int r; + + assert(m); + + if (m->meta.manager->running_as == MANAGER_SYSTEM && + !path_equal(m->where, "/")) { + + if ((r = unit_add_dependency_by_name(UNIT(m), UNIT_AFTER, SPECIAL_FSCK_TARGET, NULL, true)) < 0) + return r; + + if ((r = unit_add_two_dependencies_by_name(UNIT(m), UNIT_BEFORE, UNIT_CONFLICTED_BY, SPECIAL_UMOUNT_TARGET, NULL, true)) < 0) + return r; + } + + return 0; +} + static int mount_verify(Mount *m) { bool b; char *e; @@ -301,7 +320,7 @@ static int mount_verify(Mount *m) { return -EBADMSG; } - if (m->exec_context.pam_name && m->kill_mode != KILL_CONTROL_GROUP) { + if (m->exec_context.pam_name && m->exec_context.kill_mode != KILL_CONTROL_GROUP) { log_error("%s has PAM enabled. Kill mode must be set to 'control-group'. Refusing.", m->meta.id); return -EINVAL; } @@ -343,8 +362,10 @@ static int mount_load(Unit *u) { else if (m->from_proc_self_mountinfo && m->parameters_proc_self_mountinfo.what) what = m->parameters_proc_self_mountinfo.what; - if (what) - if ((r = unit_add_node_link(u, what, u->meta.manager->running_as == MANAGER_SYSTEM)) < 0) + if (what && !path_equal(m->where, "/")) + if ((r = unit_add_node_link(u, what, + u->meta.manager->running_as == MANAGER_SYSTEM && + u->meta.manager->mount_on_plug)) < 0) return r; if ((r = mount_add_mount_links(m)) < 0) @@ -367,6 +388,10 @@ static int mount_load(Unit *u) { if ((r = unit_add_default_cgroup(u)) < 0) return r; + + if (m->meta.default_dependencies) + if ((r = mount_add_default_dependencies(m)) < 0) + return r; } return mount_verify(m); @@ -495,7 +520,6 @@ static void mount_dump(Unit *u, FILE *f, const char *prefix) { "%sFrom /etc/fstab: %s\n" "%sFrom /proc/self/mountinfo: %s\n" "%sFrom fragment: %s\n" - "%sKillMode: %s\n" "%sDirectoryMode: %04o\n", prefix, mount_state_to_string(m->state), prefix, m->where, @@ -505,7 +529,6 @@ static void mount_dump(Unit *u, FILE *f, const char *prefix) { prefix, yes_no(m->from_etc_fstab), prefix, yes_no(m->from_proc_self_mountinfo), prefix, yes_no(m->from_fragment), - prefix, kill_mode_to_string(m->kill_mode), prefix, m->directory_mode); if (m->control_pid > 0) @@ -534,6 +557,7 @@ static int mount_spawn(Mount *m, ExecCommand *c, pid_t *_pid) { m->meta.manager->environment, true, true, + true, m->meta.manager->confirm_spawn, m->meta.cgroup_bondings, &pid)) < 0) @@ -580,12 +604,12 @@ static void mount_enter_signal(Mount *m, MountState state, bool success) { if (!success) m->failure = true; - if (m->kill_mode != KILL_NONE) { + if (m->exec_context.kill_mode != KILL_NONE) { int sig = (state == MOUNT_MOUNTING_SIGTERM || state == MOUNT_UNMOUNTING_SIGTERM || - state == MOUNT_REMOUNTING_SIGTERM) ? SIGTERM : SIGKILL; + state == MOUNT_REMOUNTING_SIGTERM) ? m->exec_context.kill_signal : SIGKILL; - if (m->kill_mode == KILL_CONTROL_GROUP) { + if (m->exec_context.kill_mode == KILL_CONTROL_GROUP) { if ((r = cgroup_bonding_kill_list(m->meta.cgroup_bondings, sig)) < 0) { if (r != -EAGAIN && r != -ESRCH) @@ -595,7 +619,10 @@ static void mount_enter_signal(Mount *m, MountState state, bool success) { } if (!sent && m->control_pid > 0) - if (kill(m->kill_mode == KILL_PROCESS ? m->control_pid : -m->control_pid, sig) < 0 && errno != ESRCH) { + if (kill(m->exec_context.kill_mode == KILL_PROCESS ? + m->control_pid : + -m->control_pid, sig) < 0 && errno != ESRCH) { + r = -errno; goto fail; } @@ -765,6 +792,7 @@ static void mount_enter_remounting(Mount *m, bool success) { return; fail: + log_warning("%s failed to run 'remount' task: %s", m->meta.id, strerror(-r)); mount_enter_mounted(m, false); } @@ -798,23 +826,20 @@ static int mount_stop(Unit *u) { assert(m); - /* Cann't do this right now. */ - if (m->state == MOUNT_MOUNTING || - m->state == MOUNT_MOUNTING_DONE || - m->state == MOUNT_MOUNTING_SIGTERM || - m->state == MOUNT_MOUNTING_SIGKILL || - m->state == MOUNT_REMOUNTING || - m->state == MOUNT_REMOUNTING_SIGTERM || - m->state == MOUNT_REMOUNTING_SIGKILL) - return -EAGAIN; - /* Already on it */ if (m->state == MOUNT_UNMOUNTING || m->state == MOUNT_UNMOUNTING_SIGKILL || m->state == MOUNT_UNMOUNTING_SIGTERM) return 0; - assert(m->state == MOUNT_MOUNTED); + assert(m->state == MOUNT_MOUNTING || + m->state == MOUNT_MOUNTING_DONE || + m->state == MOUNT_MOUNTED || + m->state == MOUNT_MOUNTING_SIGTERM || + m->state == MOUNT_MOUNTING_SIGKILL || + m->state == MOUNT_REMOUNTING || + m->state == MOUNT_REMOUNTING_SIGTERM || + m->state == MOUNT_REMOUNTING_SIGKILL); mount_enter_unmounting(m, true); return 0; @@ -855,7 +880,6 @@ static int mount_serialize(Unit *u, FILE *f, FDSet *fds) { static int mount_deserialize_item(Unit *u, const char *key, const char *value, FDSet *fds) { Mount *m = MOUNT(u); - int r; assert(u); assert(key); @@ -880,7 +904,7 @@ static int mount_deserialize_item(Unit *u, const char *key, const char *value, F } else if (streq(key, "control-pid")) { pid_t pid; - if ((r = parse_pid(value, &pid)) < 0) + if (parse_pid(value, &pid) < 0) log_debug("Failed to parse control-pid value %s", value); else m->control_pid = pid; @@ -941,7 +965,8 @@ static void mount_sigchld_event(Unit *u, pid_t pid, int code, int status) { m->control_command_id = _MOUNT_EXEC_COMMAND_INVALID; } - log_debug("%s control process exited, code=%s status=%i", u->meta.id, sigchld_code_to_string(code), status); + log_full(success ? LOG_DEBUG : LOG_NOTICE, + "%s mount process exited, code=%s status=%i", u->meta.id, sigchld_code_to_string(code), status); /* Note that mount(8) returning and the kernel sending us a * mount table change event might happen out-of-order. If an @@ -983,6 +1008,9 @@ static void mount_sigchld_event(Unit *u, pid_t pid, int code, int status) { default: assert_not_reached("Uh, control process died at wrong time."); } + + /* Notify clients about changed exit status */ + unit_add_to_dbus_queue(u); } static void mount_timer_event(Unit *u, uint64_t elapsed, Watch *w) { @@ -1150,7 +1178,7 @@ fail: } static char *fstab_node_to_udev_node(char *p) { - char *dn, *t; + char *dn, *t, *u; int r; /* FIXME: to follow udev's logic 100% we need to leave valid @@ -1158,7 +1186,13 @@ static char *fstab_node_to_udev_node(char *p) { if (startswith(p, "LABEL=")) { - if (!(t = xescape(p+6, "/ "))) + if (!(u = unquote(p+6, '"'))) + return NULL; + + t = xescape(u, "/ "); + free(u); + + if (!t) return NULL; r = asprintf(&dn, "/dev/disk/by-label/%s", t); @@ -1172,7 +1206,13 @@ static char *fstab_node_to_udev_node(char *p) { if (startswith(p, "UUID=")) { - if (!(t = xescape(p+5, "/ "))) + if (!(u = unquote(p+5, '"'))) + return NULL; + + t = xescape(u, "/ "); + free(u); + + if (!t) return NULL; r = asprintf(&dn, "/dev/disk/by-uuid/%s", ascii_strlower(t)); @@ -1400,7 +1440,7 @@ void mount_fd_event(Manager *m, int events) { * table changes */ if ((r = mount_load_proc_self_mountinfo(m, true)) < 0) { - log_error("Failed to reread /proc/self/mountinfo: %s", strerror(errno)); + log_error("Failed to reread /proc/self/mountinfo: %s", strerror(-r)); /* Reset flags, just in case, for later calls */ LIST_FOREACH(units_per_type, meta, m->units_per_type[UNIT_MOUNT]) { @@ -1465,55 +1505,15 @@ void mount_fd_event(Manager *m, int events) { } } -int mount_path_is_mounted(Manager *m, const char* path) { - char *t; - int r; +static void mount_reset_maintenance(Unit *u) { + Mount *m = MOUNT(u); assert(m); - assert(path); - - if (path[0] != '/') - return 1; - - if (!(t = strdup(path))) - return -ENOMEM; - - path_kill_slashes(t); - - for (;;) { - char *e, *slash; - Unit *u; - if (!(e = unit_name_from_path(t, ".mount"))) { - r = -ENOMEM; - goto finish; - } + if (m->state == MOUNT_MAINTENANCE) + mount_set_state(m, MOUNT_DEAD); - u = manager_get_unit(m, e); - free(e); - - if (u && - (MOUNT(u)->from_etc_fstab || MOUNT(u)->from_fragment) && - MOUNT(u)->state != MOUNT_MOUNTED) { - r = 0; - goto finish; - } - - assert_se(slash = strrchr(t, '/')); - - if (slash == t) { - r = 1; - goto finish; - } - - *slash = 0; - } - - r = 1; - -finish: - free(t); - return r; + m->failure = false; } static const char* const mount_state_table[_MOUNT_STATE_MAX] = { @@ -1573,7 +1573,11 @@ const UnitVTable mount_vtable = { .sigchld_event = mount_sigchld_event, .timer_event = mount_timer_event, + .reset_maintenance = mount_reset_maintenance, + + .bus_interface = "org.freedesktop.systemd1.Mount", .bus_message_handler = bus_mount_message_handler, + .bus_invalidating_properties = bus_mount_invalidating_properties, .enumerate = mount_enumerate, .shutdown = mount_shutdown