X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fmount.c;h=102d88b6e068846577f8b628613606fd837967a2;hp=2f966258267ff9f0925522138f76b64d62c8ddbf;hb=a76fad090a6a1388fbaa609e8ca37e82223d2bd7;hpb=ead8e4788ee31bbdc38b4cd3c6e71c8a95bbc95a diff --git a/src/mount.c b/src/mount.c index 2f9662582..102d88b6e 100644 --- a/src/mount.c +++ b/src/mount.c @@ -36,6 +36,7 @@ #include "dbus-mount.h" #include "special.h" #include "bus-errors.h" +#include "exit-status.h" static const UnitActiveState state_translation_table[_MOUNT_STATE_MAX] = { [MOUNT_DEAD] = UNIT_INACTIVE, @@ -63,6 +64,7 @@ static void mount_init(Unit *u) { m->directory_mode = 0755; exec_context_init(&m->exec_context); + m->exec_context.std_output = EXEC_OUTPUT_KMSG; /* We need to make sure that /bin/mount is always called in * the same process group as us, so that the autofs kernel @@ -97,12 +99,21 @@ static void mount_parameters_done(MountParameters *p) { static void mount_done(Unit *u) { Mount *m = MOUNT(u); + Meta *other; assert(m); free(m->where); m->where = NULL; + /* Try to detach us from the automount unit if there is any */ + LIST_FOREACH(units_per_type, other, m->meta.manager->units_per_type[UNIT_AUTOMOUNT]) { + Automount *a = (Automount*) other; + + if (a->mount == m) + a->mount = NULL; + } + mount_parameters_done(&m->parameters_etc_fstab); mount_parameters_done(&m->parameters_proc_self_mountinfo); mount_parameters_done(&m->parameters_fragment); @@ -265,7 +276,7 @@ static int mount_add_target_links(Mount *m) { MountParameters *p; Unit *tu; int r; - bool noauto, handle, automount; + bool noauto, nofail, handle, automount; assert(m); @@ -277,6 +288,7 @@ static int mount_add_target_links(Mount *m) { return 0; noauto = !!mount_test_option(p->options, MNTOPT_NOAUTO); + nofail = !!mount_test_option(p->options, "nofail"); handle = !!mount_test_option(p->options, "comment=systemd.mount") || m->meta.manager->mount_auto; automount = !!mount_test_option(p->options, "comment=systemd.automount"); @@ -309,6 +321,7 @@ static int mount_add_target_links(Mount *m) { /* Automatically add mount points that aren't natively * configured to local-fs.target */ if (!noauto && + !nofail && handle && m->from_etc_fstab && m->meta.manager->running_as == MANAGER_SYSTEM) @@ -360,6 +373,7 @@ static int mount_add_device_links(Mount *m) { } if (p->passno > 0 && + !mount_is_bind(p) && UNIT(m)->meta.manager->running_as == MANAGER_SYSTEM && !path_equal(m->where, "/")) { char *name; @@ -452,6 +466,9 @@ static int mount_load(Unit *u) { /* This is a new unit? Then let's add in some extras */ if (u->meta.load_state == UNIT_LOADED) { + if ((r = unit_add_exec_dependencies(u, &m->exec_context)) < 0) + return r; + if (m->meta.fragment_path) m->from_fragment = true; @@ -486,7 +503,7 @@ static int mount_load(Unit *u) { if ((r = mount_add_target_links(m)) < 0) return r; - if ((r = unit_add_default_cgroup(u)) < 0) + if ((r = unit_add_default_cgroups(u)) < 0) return r; if (m->meta.default_dependencies) @@ -552,7 +569,8 @@ static void mount_set_state(Mount *m, MountState state) { mount_state_to_string(old_state), mount_state_to_string(state)); - unit_notify(UNIT(m), state_translation_table[old_state], state_translation_table[state]); + unit_notify(UNIT(m), state_translation_table[old_state], state_translation_table[state], !m->reload_failure); + m->reload_failure = false; } static int mount_coldplug(Unit *u) { @@ -908,7 +926,8 @@ static void mount_enter_remounting(Mount *m, bool success) { fail: log_warning("%s failed to run 'remount' task: %s", m->meta.id, strerror(-r)); - mount_enter_mounted(m, false); + m->reload_failure = true; + mount_enter_mounted(m, true); } static int mount_start(Unit *u) { @@ -1096,9 +1115,6 @@ static void mount_sigchld_event(Unit *u, pid_t pid, int code, int status) { case MOUNT_MOUNTING_DONE: case MOUNT_MOUNTING_SIGKILL: case MOUNT_MOUNTING_SIGTERM: - case MOUNT_REMOUNTING: - case MOUNT_REMOUNTING_SIGKILL: - case MOUNT_REMOUNTING_SIGTERM: if (success) mount_enter_mounted(m, true); @@ -1108,6 +1124,18 @@ static void mount_sigchld_event(Unit *u, pid_t pid, int code, int status) { mount_enter_dead(m, false); break; + case MOUNT_REMOUNTING: + case MOUNT_REMOUNTING_SIGKILL: + case MOUNT_REMOUNTING_SIGTERM: + + m->reload_failure = !success; + if (m->from_proc_self_mountinfo) + mount_enter_mounted(m, true); + else + mount_enter_dead(m, true); + + break; + case MOUNT_UNMOUNTING: case MOUNT_UNMOUNTING_SIGKILL: case MOUNT_UNMOUNTING_SIGTERM: @@ -1145,7 +1173,8 @@ static void mount_timer_event(Unit *u, uint64_t elapsed, Watch *w) { case MOUNT_REMOUNTING: log_warning("%s remounting timed out. Stopping.", u->meta.id); - mount_enter_signal(m, MOUNT_REMOUNTING_SIGTERM, false); + m->reload_failure = true; + mount_enter_mounted(m, true); break; case MOUNT_UNMOUNTING: @@ -1154,18 +1183,45 @@ static void mount_timer_event(Unit *u, uint64_t elapsed, Watch *w) { break; case MOUNT_MOUNTING_SIGTERM: - log_warning("%s mounting timed out. Killing.", u->meta.id); - mount_enter_signal(m, MOUNT_MOUNTING_SIGKILL, false); + if (m->exec_context.send_sigkill) { + log_warning("%s mounting timed out. Killing.", u->meta.id); + mount_enter_signal(m, MOUNT_MOUNTING_SIGKILL, false); + } else { + log_warning("%s mounting timed out. Skipping SIGKILL. Ignoring.", u->meta.id); + + if (m->from_proc_self_mountinfo) + mount_enter_mounted(m, false); + else + mount_enter_dead(m, false); + } break; case MOUNT_REMOUNTING_SIGTERM: - log_warning("%s remounting timed out. Killing.", u->meta.id); - mount_enter_signal(m, MOUNT_REMOUNTING_SIGKILL, false); + if (m->exec_context.send_sigkill) { + log_warning("%s remounting timed out. Killing.", u->meta.id); + mount_enter_signal(m, MOUNT_REMOUNTING_SIGKILL, false); + } else { + log_warning("%s remounting timed out. Skipping SIGKILL. Ignoring.", u->meta.id); + + if (m->from_proc_self_mountinfo) + mount_enter_mounted(m, false); + else + mount_enter_dead(m, false); + } break; case MOUNT_UNMOUNTING_SIGTERM: - log_warning("%s unmounting timed out. Killing.", u->meta.id); - mount_enter_signal(m, MOUNT_UNMOUNTING_SIGKILL, false); + if (m->exec_context.send_sigkill) { + log_warning("%s unmounting timed out. Killing.", u->meta.id); + mount_enter_signal(m, MOUNT_UNMOUNTING_SIGKILL, false); + } else { + log_warning("%s unmounting timed out. Skipping SIGKILL. Ignoring.", u->meta.id); + + if (m->from_proc_self_mountinfo) + mount_enter_mounted(m, false); + else + mount_enter_dead(m, false); + } break; case MOUNT_MOUNTING_SIGKILL: @@ -1211,6 +1267,8 @@ static int mount_add_one( * dependencies ever. */ if (mount_point_is_api(where)) return 0; + if (mount_point_ignore(where)) + return 0; if (streq(fstype, "autofs")) return 0; @@ -1295,56 +1353,6 @@ fail: return r; } -static char *fstab_node_to_udev_node(char *p) { - char *dn, *t, *u; - int r; - - /* FIXME: to follow udev's logic 100% we need to leave valid - * UTF8 chars unescaped */ - - if (startswith(p, "LABEL=")) { - - 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); - free(t); - - if (r < 0) - return NULL; - - return dn; - } - - if (startswith(p, "UUID=")) { - - 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)); - free(t); - - if (r < 0) - return NULL; - - return dn; - } - - return strdup(p); -} - static int mount_find_pri(char *options) { char *end, *pri; unsigned long r;