X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fmount.c;h=2b19f497f33bc77bb5129b278b0ae75aa64df654;hp=8528d17a804ffa9d796872c06bbeeca7319d4156;hb=c8f4d7642b743c79328e10e8fb2d9b58e9f6b999;hpb=cd25cce98f5cc930202212c3c9c13605c09698b4 diff --git a/src/mount.c b/src/mount.c index 8528d17a8..2b19f497f 100644 --- a/src/mount.c +++ b/src/mount.c @@ -65,7 +65,11 @@ static void mount_init(Unit *u) { m->directory_mode = 0755; exec_context_init(&m->exec_context); - m->exec_context.std_output = EXEC_OUTPUT_KMSG; + + /* The stdio/kmsg bridge socket is on /, in order to avoid a + * dep loop, don't use kmsg logging for -.mount */ + if (!unit_has_name(u, "-.mount")) + 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 @@ -76,6 +80,8 @@ static void mount_init(Unit *u) { m->timer_watch.type = WATCH_INVALID; m->control_command_id = _MOUNT_EXEC_COMMAND_INVALID; + + m->meta.ignore_on_isolate = true; } static void mount_unwatch_control_pid(Mount *m) { @@ -128,6 +134,26 @@ static void mount_done(Unit *u) { unit_unwatch_timer(u, &m->timer_watch); } +static MountParameters* get_mount_parameters_configured(Mount *m) { + assert(m); + + if (m->from_fragment) + return &m->parameters_fragment; + else if (m->from_etc_fstab) + return &m->parameters_etc_fstab; + + return NULL; +} + +static MountParameters* get_mount_parameters(Mount *m) { + assert(m); + + if (m->from_proc_self_mountinfo) + return &m->parameters_proc_self_mountinfo; + + return get_mount_parameters_configured(m); +} + static int mount_add_mount_links(Mount *m) { Meta *other; int r; @@ -135,12 +161,7 @@ static int mount_add_mount_links(Mount *m) { assert(m); - if (m->from_fragment) - pm = &m->parameters_fragment; - else if (m->from_etc_fstab) - pm = &m->parameters_etc_fstab; - else - pm = NULL; + pm = get_mount_parameters_configured(m); /* Adds in links to other mount points that might lie below or * above us in the hierarchy */ @@ -155,19 +176,14 @@ static int mount_add_mount_links(Mount *m) { if (n->meta.load_state != UNIT_LOADED) continue; - if (n->from_fragment) - pn = &n->parameters_fragment; - else if (n->from_etc_fstab) - pn = &n->parameters_etc_fstab; - else - pn = NULL; + pn = get_mount_parameters_configured(n); if (path_startswith(m->where, n->where)) { if ((r = unit_add_dependency(UNIT(m), UNIT_AFTER, UNIT(n), true)) < 0) return r; - if (n->from_etc_fstab || n->from_fragment) + if (pn) if ((r = unit_add_dependency(UNIT(m), UNIT_REQUIRES, UNIT(n), true)) < 0) return r; @@ -176,7 +192,7 @@ static int mount_add_mount_links(Mount *m) { if ((r = unit_add_dependency(UNIT(n), UNIT_AFTER, UNIT(m), true)) < 0) return r; - if (m->from_etc_fstab || m->from_fragment) + if (pm) if ((r = unit_add_dependency(UNIT(n), UNIT_REQUIRES, UNIT(m), true)) < 0) return r; @@ -185,18 +201,16 @@ static int mount_add_mount_links(Mount *m) { if ((r = unit_add_dependency(UNIT(m), UNIT_AFTER, UNIT(n), true)) < 0) return r; - if (m->from_etc_fstab || m->from_fragment) - if ((r = unit_add_dependency(UNIT(m), UNIT_REQUIRES, UNIT(n), true)) < 0) - return r; + if ((r = unit_add_dependency(UNIT(m), UNIT_REQUIRES, UNIT(n), true)) < 0) + return r; } else if (pn && path_startswith(pn->what, m->where)) { if ((r = unit_add_dependency(UNIT(n), UNIT_AFTER, UNIT(m), true)) < 0) return r; - if (n->from_etc_fstab || n->from_fragment) - if ((r = unit_add_dependency(UNIT(n), UNIT_REQUIRES, UNIT(m), true)) < 0) - return r; + if ((r = unit_add_dependency(UNIT(n), UNIT_REQUIRES, UNIT(m), true)) < 0) + return r; } } @@ -272,6 +286,43 @@ static char* mount_test_option(const char *haystack, const char *needle) { return hasmntopt(&me, needle); } +static bool mount_is_network(MountParameters *p) { + assert(p); + + if (mount_test_option(p->options, "_netdev")) + return true; + + if (p->fstype && fstype_is_network(p->fstype)) + return true; + + return false; +} + +static bool mount_is_bind(MountParameters *p) { + assert(p); + + if (mount_test_option(p->options, "bind")) + return true; + + if (p->fstype && streq(p->fstype, "bind")) + return true; + + return false; +} + +static bool needs_quota(MountParameters *p) { + assert(p); + + if (mount_is_network(p)) + return false; + + if (mount_is_bind(p)) + return false; + + return mount_test_option(p->options, "usrquota") || + mount_test_option(p->options, "grpquota"); +} + static int mount_add_target_links(Mount *m) { const char *target, *after = NULL; MountParameters *p; @@ -281,11 +332,7 @@ static int mount_add_target_links(Mount *m) { assert(m); - if (m->from_fragment) - p = &m->parameters_fragment; - else if (m->from_etc_fstab) - p = &m->parameters_etc_fstab; - else + if (!(p = get_mount_parameters_configured(m))) return 0; noauto = !!mount_test_option(p->options, MNTOPT_NOAUTO); @@ -298,8 +345,7 @@ static int mount_add_target_links(Mount *m) { mount_test_option(p->options, "comment=systemd.automount") || mount_test_option(p->options, "x-systemd-automount"); - if (mount_test_option(p->options, "_netdev") || - (p->fstype && fstype_is_network(p->fstype))) { + if (mount_is_network(p)) { target = SPECIAL_REMOTE_FS_TARGET; if (m->meta.manager->running_as == MANAGER_SYSTEM) @@ -337,29 +383,13 @@ static int mount_add_target_links(Mount *m) { } } -static bool mount_is_bind(MountParameters *p) { - assert(p); - - if (p->fstype && streq(p->fstype, "bind")) - return true; - - if (mount_test_option(p->options, "bind")) - return true; - - return false; -} - static int mount_add_device_links(Mount *m) { MountParameters *p; int r; assert(m); - if (m->from_fragment) - p = &m->parameters_fragment; - else if (m->from_etc_fstab) - p = &m->parameters_etc_fstab; - else + if (!(p = get_mount_parameters_configured(m))) return 0; if (!p->what) @@ -415,20 +445,13 @@ static int mount_add_default_dependencies(Mount *m) { !path_equal(m->where, "/")) { MountParameters *p; - if (m->from_fragment) - p = &m->parameters_fragment; - else if (m->from_etc_fstab) - p = &m->parameters_etc_fstab; - else - p = NULL; + p = get_mount_parameters_configured(m); - if (!p || - (!mount_test_option(p->options, "_netdev") && - !(p->fstype && fstype_is_network(p->fstype)) && - (mount_test_option(p->options, "usrquota") || mount_test_option(p->options, "grpquota")))) + if (p && needs_quota(p)) { if ((r = unit_add_two_dependencies_by_name(UNIT(m), UNIT_BEFORE, UNIT_WANTS, SPECIAL_QUOTACHECK_SERVICE, NULL, true)) < 0 || (r = unit_add_two_dependencies_by_name(UNIT(m), UNIT_BEFORE, UNIT_WANTS, SPECIAL_QUOTAON_SERVICE, NULL, true)) < 0) return r; + } if ((r = unit_add_two_dependencies_by_name(UNIT(m), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET, NULL, true)) < 0) return r; @@ -459,6 +482,11 @@ static int mount_verify(Mount *m) { return -EINVAL; } + if (mount_point_is_api(m->where) || mount_point_ignore(m->where)) { + log_error("Cannot create mount unit for API file system %s. Refusing.", m->where); + return -EINVAL; + } + if (m->meta.fragment_path && !m->parameters_fragment.what) { log_error("%s's What setting is missing. Refusing.", m->meta.id); return -EBADMSG; @@ -640,12 +668,7 @@ static void mount_dump(Unit *u, FILE *f, const char *prefix) { assert(m); assert(f); - if (m->from_proc_self_mountinfo) - p = &m->parameters_proc_self_mountinfo; - else if (m->from_fragment) - p = &m->parameters_fragment; - else - p = &m->parameters_etc_fstab; + p = get_mount_parameters(m); fprintf(f, "%sMount State: %s\n" @@ -773,6 +796,7 @@ static void mount_enter_signal(Mount *m, MountState state, bool success) { wait_for_exit = true; set_free(pid_set); + pid_set = NULL; } } @@ -834,6 +858,7 @@ fail: static void mount_enter_mounting(Mount *m) { int r; + MountParameters *p; assert(m); @@ -842,9 +867,10 @@ static void mount_enter_mounting(Mount *m) { mkdir_p(m->where, m->directory_mode); - /* create the source directory for bind-mounts if needed */ - if (m->parameters_fragment.fstype && strcmp(m->parameters_fragment.fstype, "bind") == 0) - mkdir_p(m->parameters_fragment.what, m->directory_mode); + /* Create the source directory for bind-mounts if needed */ + p = get_mount_parameters_configured(m); + if (p && mount_is_bind(p)) + mkdir_p(p->what, m->directory_mode); if (m->from_fragment) r = exec_command_set( @@ -1285,9 +1311,7 @@ static int mount_add_one( /* Ignore API mount points. They should never be referenced in * dependencies ever. */ - if (mount_point_is_api(where)) - return 0; - if (mount_point_ignore(where)) + if (mount_point_is_api(where) || mount_point_ignore(where)) return 0; if (streq(fstype, "autofs")) @@ -1741,7 +1765,6 @@ const UnitVTable mount_vtable = { .no_alias = true, .no_instances = true, - .no_isolate = true, .show_status = true, .init = mount_init,