-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
/***
This file is part of systemd.
#include "strv.h"
#include "mount-setup.h"
#include "unit-name.h"
-#include "mount.h"
#include "dbus-mount.h"
#include "special.h"
+#include "bus-errors.h"
+#include "exit-status.h"
+#include "def.h"
static const UnitActiveState state_translation_table[_MOUNT_STATE_MAX] = {
[MOUNT_DEAD] = UNIT_INACTIVE,
[MOUNT_REMOUNTING_SIGKILL] = UNIT_RELOADING,
[MOUNT_UNMOUNTING_SIGTERM] = UNIT_DEACTIVATING,
[MOUNT_UNMOUNTING_SIGKILL] = UNIT_DEACTIVATING,
- [MOUNT_MAINTENANCE] = UNIT_MAINTENANCE
+ [MOUNT_FAILED] = UNIT_FAILED
};
static void mount_init(Unit *u) {
exec_context_init(&m->exec_context);
+ /* 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 = u->meta.manager->default_std_output;
+ m->exec_context.std_error = u->meta.manager->default_std_error;
+ }
+
/* 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
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) {
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_by_type, other, m->meta.manager->units_by_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);
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;
+ MountParameters *pm;
assert(m);
+ pm = get_mount_parameters_configured(m);
+
/* Adds in links to other mount points that might lie below or
* above us in the hierarchy */
- LIST_FOREACH(units_per_type, other, m->meta.manager->units_per_type[UNIT_MOUNT]) {
+ LIST_FOREACH(units_by_type, other, m->meta.manager->units_by_type[UNIT_MOUNT]) {
Mount *n = (Mount*) other;
+ MountParameters *pn;
if (n == m)
continue;
if (n->meta.load_state != UNIT_LOADED)
continue;
+ 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;
} else if (path_startswith(n->where, m->where)) {
- if ((r = unit_add_dependency(UNIT(m), UNIT_BEFORE, UNIT(n), true)) < 0)
+ 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;
+
+ } else if (pm && path_startswith(pm->what, n->where)) {
+
+ if ((r = unit_add_dependency(UNIT(m), UNIT_AFTER, 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 ((r = unit_add_dependency(UNIT(n), UNIT_REQUIRES, UNIT(m), true)) < 0)
+ return r;
}
}
assert(m);
- LIST_FOREACH(units_per_type, other, m->meta.manager->units_per_type[UNIT_SWAP])
+ LIST_FOREACH(units_by_type, other, m->meta.manager->units_by_type[UNIT_SWAP])
if ((r = swap_add_one_mount_link((Swap*) other, m)) < 0)
return r;
assert(m);
- LIST_FOREACH(units_per_type, other, m->meta.manager->units_per_type[UNIT_PATH])
+ LIST_FOREACH(units_by_type, other, m->meta.manager->units_by_type[UNIT_PATH])
if ((r = path_add_one_mount_link((Path*) other, m)) < 0)
return r;
assert(m);
- LIST_FOREACH(units_per_type, other, m->meta.manager->units_per_type[UNIT_AUTOMOUNT])
+ LIST_FOREACH(units_by_type, other, m->meta.manager->units_by_type[UNIT_AUTOMOUNT])
if ((r = automount_add_one_mount_link((Automount*) other, m)) < 0)
return r;
assert(m);
- LIST_FOREACH(units_per_type, other, m->meta.manager->units_per_type[UNIT_SOCKET])
+ LIST_FOREACH(units_by_type, other, m->meta.manager->units_by_type[UNIT_SOCKET])
if ((r = socket_add_one_mount_link((Socket*) other, m)) < 0)
return r;
return hasmntopt(&me, needle);
}
-static int mount_add_target_links(Mount *m) {
- const char *target;
+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") ||
+ mount_test_option(p->options, "quota") ||
+ mount_test_option(p->options, "usrjquota") ||
+ mount_test_option(p->options, "grpjquota");
+}
+
+static int mount_add_fstab_links(Mount *m) {
+ const char *target, *after = NULL, *after2 = NULL;
MountParameters *p;
Unit *tu;
int r;
- bool noauto, handle, automount, user;
+ bool noauto, nofail, handle, automount;
assert(m);
- if (m->from_fragment)
- p = &m->parameters_fragment;
- else if (m->from_etc_fstab)
- p = &m->parameters_etc_fstab;
- else
+ if (m->meta.manager->running_as != MANAGER_SYSTEM)
+ return 0;
+
+ if (!(p = get_mount_parameters_configured(m)))
return 0;
- 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");
- automount = !!mount_test_option(p->options, "comment=systemd.automount");
+ if (p != &m->parameters_etc_fstab)
+ return 0;
- if (mount_test_option(p->options, "_netdev") ||
- fstype_is_network(p->fstype))
+ noauto = !!mount_test_option(p->options, "noauto");
+ nofail = !!mount_test_option(p->options, "nofail");
+ automount =
+ mount_test_option(p->options, "comment=systemd.automount") ||
+ mount_test_option(p->options, "x-systemd-automount");
+ handle =
+ automount ||
+ mount_test_option(p->options, "comment=systemd.mount") ||
+ mount_test_option(p->options, "x-systemd-mount") ||
+ m->meta.manager->mount_auto;
+
+ if (mount_is_network(p)) {
target = SPECIAL_REMOTE_FS_TARGET;
- else
+ after = SPECIAL_REMOTE_FS_PRE_TARGET;
+ after2 = SPECIAL_NETWORK_TARGET;
+ } else {
target = SPECIAL_LOCAL_FS_TARGET;
+ after = SPECIAL_LOCAL_FS_PRE_TARGET;
+ }
+
+ if (!path_equal(m->where, "/"))
+ if ((r = unit_add_two_dependencies_by_name(UNIT(m), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET, NULL, true)) < 0)
+ return r;
if ((r = manager_load_unit(m->meta.manager, target, NULL, NULL, &tu)) < 0)
return r;
- if (automount && m->meta.manager->running_as == MANAGER_SYSTEM) {
+ if (after)
+ if ((r = unit_add_dependency_by_name(UNIT(m), UNIT_AFTER, after, NULL, true)) < 0)
+ return r;
+
+ if (after2)
+ if ((r = unit_add_dependency_by_name(UNIT(m), UNIT_AFTER, after2, NULL, true)) < 0)
+ return r;
+
+ if (automount) {
Unit *am;
if ((r = unit_load_related_unit(UNIT(m), ".automount", &am)) < 0)
return r;
- return unit_add_two_dependencies(tu, UNIT_AFTER, UNIT_WANTS, UNIT(am), true);
- } else {
+ /* If auto is configured as well also pull in the
+ * mount right-away, but don't rely on it. */
+ if (!noauto) /* automount + auto */
+ if ((r = unit_add_dependency(tu, UNIT_WANTS, UNIT(m), true)) < 0)
+ return r;
- if (!noauto && handle)
- if (user || m->meta.manager->running_as == MANAGER_SYSTEM)
- if ((r = unit_add_dependency(tu, UNIT_WANTS, UNIT(m), true)) < 0)
- return r;
+ /* Install automount unit */
+ if (!nofail) /* automount + fail */
+ return unit_add_two_dependencies(tu, UNIT_AFTER, UNIT_REQUIRES, UNIT(am), true);
+ else /* automount + nofail */
+ return unit_add_two_dependencies(tu, UNIT_AFTER, UNIT_WANTS, UNIT(am), true);
+
+ } else if (handle && !noauto) {
+
+ /* Automatically add mount points that aren't natively
+ * configured to local-fs.target */
+
+ if (!nofail) /* auto + fail */
+ return unit_add_two_dependencies(tu, UNIT_AFTER, UNIT_REQUIRES, UNIT(m), true);
+ else /* auto + nofail */
+ return unit_add_dependency(tu, UNIT_WANTS, UNIT(m), true);
+ }
+
+ return 0;
+}
+
+static int mount_add_device_links(Mount *m) {
+ MountParameters *p;
+ int r;
+
+ assert(m);
+
+ if (!(p = get_mount_parameters_configured(m)))
+ return 0;
+
+ if (!p->what)
+ return 0;
+
+ if (!mount_is_bind(p) &&
+ !path_equal(m->where, "/") &&
+ p == &m->parameters_etc_fstab) {
+ bool nofail, noauto;
+
+ noauto = !!mount_test_option(p->options, "noauto");
+ nofail = !!mount_test_option(p->options, "nofail");
+
+ if ((r = unit_add_node_link(UNIT(m), p->what,
+ !noauto && nofail &&
+ UNIT(m)->meta.manager->running_as == MANAGER_SYSTEM)) < 0)
+ return r;
+ }
+
+ if (p->passno > 0 &&
+ !mount_is_bind(p) &&
+ UNIT(m)->meta.manager->running_as == MANAGER_SYSTEM &&
+ !path_equal(m->where, "/")) {
+ char *name;
+ Unit *fsck;
+ /* Let's add in the fsck service */
+
+ /* aka SPECIAL_FSCK_SERVICE */
+ if (!(name = unit_name_from_path_instance("fsck", p->what, ".service")))
+ return -ENOMEM;
+
+ if ((r = manager_load_unit_prepare(m->meta.manager, name, NULL, NULL, &fsck)) < 0) {
+ log_warning("Failed to prepare unit %s: %s", name, strerror(-r));
+ free(name);
+ return r;
+ }
+
+ free(name);
+
+ SERVICE(fsck)->fsck_passno = p->passno;
- return unit_add_dependency(UNIT(m), UNIT_BEFORE, tu, true);
+ if ((r = unit_add_two_dependencies(UNIT(m), UNIT_AFTER, UNIT_REQUIRES, fsck, true)) < 0)
+ return r;
}
+
+ return 0;
}
static int mount_add_default_dependencies(Mount *m) {
if (m->meta.manager->running_as == MANAGER_SYSTEM &&
!path_equal(m->where, "/")) {
+ MountParameters *p;
- if ((r = unit_add_dependency_by_name(UNIT(m), UNIT_AFTER, SPECIAL_FSCK_TARGET, NULL, true)) < 0)
- return r;
+ p = get_mount_parameters_configured(m);
- if ((r = unit_add_two_dependencies_by_name(UNIT(m), UNIT_BEFORE, UNIT_CONFLICTED_BY, SPECIAL_UMOUNT_TARGET, NULL, true)) < 0)
+ 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;
}
return 0;
}
+static int mount_fix_timeouts(Mount *m) {
+ MountParameters *p;
+ const char *timeout = NULL;
+ Unit *other;
+ Iterator i;
+ usec_t u;
+ char *t;
+ int r;
+
+ assert(m);
+
+ if (!(p = get_mount_parameters_configured(m)))
+ return 0;
+
+ /* Allow configuration how long we wait for a device that
+ * backs a mount point to show up. This is useful to support
+ * endless device timeouts for devices that show up only after
+ * user input, like crypto devices. */
+
+ if ((timeout = mount_test_option(p->options, "comment=systemd.device-timeout")))
+ timeout += 31;
+ else if ((timeout = mount_test_option(p->options, "x-systemd-device-timeout")))
+ timeout += 25;
+ else
+ return 0;
+
+ t = strndup(timeout, strcspn(timeout, ",;" WHITESPACE));
+ if (!t)
+ return -ENOMEM;
+
+ r = parse_usec(t, &u);
+ free(t);
+
+ if (r < 0) {
+ log_warning("Failed to parse timeout for %s, ignoring: %s", m->where, timeout);
+ return r;
+ }
+
+ SET_FOREACH(other, m->meta.dependencies[UNIT_AFTER], i) {
+ if (other->meta.type != UNIT_DEVICE)
+ continue;
+
+ other->meta.job_timeout = u;
+ }
+
+ return 0;
+}
+
static int mount_verify(Mount *m) {
bool b;
char *e;
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;
/* This is a new unit? Then let's add in some extras */
if (u->meta.load_state == UNIT_LOADED) {
- const char *what = NULL;
+ if ((r = unit_add_exec_dependencies(u, &m->exec_context)) < 0)
+ return r;
if (m->meta.fragment_path)
m->from_fragment = true;
+ else if (m->from_etc_fstab)
+ m->meta.default_dependencies = false;
if (!m->where)
if (!(m->where = unit_name_to_path(u->meta.id)))
if ((r = unit_set_description(u, m->where)) < 0)
return r;
- if (m->from_fragment && m->parameters_fragment.what)
- what = m->parameters_fragment.what;
- else if (m->from_etc_fstab && m->parameters_etc_fstab.what)
- what = m->parameters_etc_fstab.what;
- 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)
- return r;
+ if ((r = mount_add_device_links(m)) < 0)
+ return r;
if ((r = mount_add_mount_links(m)) < 0)
return r;
if ((r = mount_add_automount_links(m)) < 0)
return r;
- if ((r = mount_add_target_links(m)) < 0)
- return r;
-
- if ((r = unit_add_default_cgroup(u)) < 0)
+ if ((r = mount_add_fstab_links(m)) < 0)
return r;
if (m->meta.default_dependencies)
if ((r = mount_add_default_dependencies(m)) < 0)
return r;
+
+ if ((r = unit_add_default_cgroups(u)) < 0)
+ return r;
+
+ mount_fix_timeouts(m);
}
return mount_verify(m);
state == MOUNT_REMOUNTING_SIGKILL ||
state == MOUNT_UNMOUNTING_SIGTERM ||
state == MOUNT_UNMOUNTING_SIGKILL ||
- state == MOUNT_MAINTENANCE)
+ state == MOUNT_FAILED)
mount_notify_automount(m, -ENODEV);
if (state != old_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) {
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"
true,
m->meta.manager->confirm_spawn,
m->meta.cgroup_bondings,
+ m->meta.cgroup_attributes,
&pid)) < 0)
goto fail;
if (!success)
m->failure = true;
- mount_set_state(m, m->failure ? MOUNT_MAINTENANCE : MOUNT_DEAD);
+ mount_set_state(m, m->failure ? MOUNT_FAILED : MOUNT_DEAD);
}
static void mount_enter_mounted(Mount *m, bool success) {
static void mount_enter_signal(Mount *m, MountState state, bool success) {
int r;
- bool sent = false;
+ Set *pid_set = NULL;
+ bool wait_for_exit = false;
assert(m);
state == MOUNT_UNMOUNTING_SIGTERM ||
state == MOUNT_REMOUNTING_SIGTERM) ? m->exec_context.kill_signal : SIGKILL;
- if (m->exec_context.kill_mode == KILL_CONTROL_GROUP) {
+ if (m->control_pid > 0) {
+ if (kill_and_sigcont(m->control_pid, sig) < 0 && errno != ESRCH)
- if ((r = cgroup_bonding_kill_list(m->meta.cgroup_bondings, sig)) < 0) {
- if (r != -EAGAIN && r != -ESRCH)
- goto fail;
- } else
- sent = true;
+ log_warning("Failed to kill control process %li: %m", (long) m->control_pid);
+ else
+ wait_for_exit = true;
}
- if (!sent && m->control_pid > 0)
- if (kill(m->exec_context.kill_mode == KILL_PROCESS ?
- m->control_pid :
- -m->control_pid, sig) < 0 && errno != ESRCH) {
+ if (m->exec_context.kill_mode == KILL_CONTROL_GROUP) {
- r = -errno;
+ if (!(pid_set = set_new(trivial_hash_func, trivial_compare_func))) {
+ r = -ENOMEM;
goto fail;
}
+
+ /* Exclude the control pid from being killed via the cgroup */
+ if (m->control_pid > 0)
+ if ((r = set_put(pid_set, LONG_TO_PTR(m->control_pid))) < 0)
+ goto fail;
+
+ if ((r = cgroup_bonding_kill_list(m->meta.cgroup_bondings, sig, true, pid_set)) < 0) {
+ if (r != -EAGAIN && r != -ESRCH && r != -ENOENT)
+ log_warning("Failed to kill control group: %s", strerror(-r));
+ } else if (r > 0)
+ wait_for_exit = true;
+
+ set_free(pid_set);
+ pid_set = NULL;
+ }
}
- if (sent) {
+ if (wait_for_exit) {
if ((r = unit_watch_timer(UNIT(m), m->timeout_usec, &m->timer_watch)) < 0)
goto fail;
mount_enter_mounted(m, false);
else
mount_enter_dead(m, false);
+
+ if (pid_set)
+ set_free(pid_set);
}
static void mount_enter_unmounting(Mount *m, bool success) {
static void mount_enter_mounting(Mount *m) {
int r;
+ MountParameters *p;
assert(m);
mkdir_p(m->where, 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(
m->control_command,
"/bin/mount",
m->parameters_fragment.what,
m->where,
- "-t", m->parameters_fragment.fstype,
+ "-t", m->parameters_fragment.fstype ? m->parameters_fragment.fstype : "auto",
m->parameters_fragment.options ? "-o" : NULL, m->parameters_fragment.options,
NULL);
else if (m->from_etc_fstab)
"/bin/mount",
m->parameters_fragment.what,
m->where,
- "-t", m->parameters_fragment.fstype,
+ "-t", m->parameters_fragment.fstype ? m->parameters_fragment.fstype : "auto",
"-o", o,
NULL);
else
r = -ENOENT;
- if (r < 0) {
- r = -ENOMEM;
+ if (r < 0)
goto fail;
- }
mount_unwatch_control_pid(m);
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) {
* please! */
if (m->state == MOUNT_UNMOUNTING ||
m->state == MOUNT_UNMOUNTING_SIGTERM ||
- m->state == MOUNT_UNMOUNTING_SIGKILL)
+ m->state == MOUNT_UNMOUNTING_SIGKILL ||
+ m->state == MOUNT_MOUNTING_SIGTERM ||
+ m->state == MOUNT_MOUNTING_SIGKILL)
return -EAGAIN;
/* Already on it! */
- if (m->state == MOUNT_MOUNTING ||
- m->state == MOUNT_MOUNTING_SIGTERM ||
- m->state == MOUNT_MOUNTING_SIGKILL)
+ if (m->state == MOUNT_MOUNTING)
return 0;
- assert(m->state == MOUNT_DEAD || m->state == MOUNT_MAINTENANCE);
+ assert(m->state == MOUNT_DEAD || m->state == MOUNT_FAILED);
m->failure = false;
mount_enter_mounting(m);
/* Already on it */
if (m->state == MOUNT_UNMOUNTING ||
m->state == MOUNT_UNMOUNTING_SIGKILL ||
- m->state == MOUNT_UNMOUNTING_SIGTERM)
+ m->state == MOUNT_UNMOUNTING_SIGTERM ||
+ m->state == MOUNT_MOUNTING_SIGTERM ||
+ m->state == MOUNT_MOUNTING_SIGKILL)
return 0;
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);
m->failure = m->failure || !success;
if (m->control_command) {
- exec_status_exit(&m->control_command->exec_status, pid, code, status);
+ exec_status_exit(&m->control_command->exec_status, &m->exec_context, pid, code, status);
m->control_command = NULL;
m->control_command_id = _MOUNT_EXEC_COMMAND_INVALID;
}
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);
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:
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) {
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:
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:
const char *where,
const char *options,
const char *fstype,
+ int passno,
bool from_proc_self_mountinfo,
bool set_flags) {
int r;
/* Ignore API mount points. They should never be referenced in
* dependencies ever. */
- if (mount_point_is_api(where))
+ if (mount_point_is_api(where) || mount_point_ignore(where))
return 0;
if (streq(fstype, "autofs"))
free(p->fstype);
p->fstype = f;
+ p->passno = passno;
+
unit_add_to_dbus_queue(u);
return 0;
return r;
}
-static char *fstab_node_to_udev_node(char *p) {
- char *dn, *t;
- int r;
-
- /* FIXME: to follow udev's logic 100% we need to leave valid
- * UTF8 chars unescaped */
-
- if (startswith(p, "LABEL=")) {
-
- if (!(t = xescape(p+6, "/ ")))
- 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 (!(t = xescape(p+5, "/ ")))
- 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;
- if (!(pri = mount_test_option(options, "pri=")))
+ if (!(pri = mount_test_option(options, "pri")))
return 0;
pri += 4;
static int mount_load_etc_fstab(Manager *m) {
FILE *f;
- int r;
+ int r = 0;
struct mntent* me;
assert(m);
while ((me = getmntent(f))) {
char *where, *what;
+ int k;
if (!(what = fstab_node_to_udev_node(me->mnt_fsname))) {
r = -ENOMEM;
int pri;
if ((pri = mount_find_pri(me->mnt_opts)) < 0)
- r = pri;
+ k = pri;
else
- r = swap_add_one(m,
+ k = swap_add_one(m,
what,
+ NULL,
pri,
- !!mount_test_option(me->mnt_opts, MNTOPT_NOAUTO),
+ !!mount_test_option(me->mnt_opts, "noauto"),
+ !!mount_test_option(me->mnt_opts, "nofail"),
!!mount_test_option(me->mnt_opts, "comment=systemd.swapon"),
false);
} else
- r = mount_add_one(m, what, where, me->mnt_opts, me->mnt_type, false, false);
+ k = mount_add_one(m, what, where, me->mnt_opts, me->mnt_type, me->mnt_passno, false, false);
free(what);
free(where);
if (r < 0)
- goto finish;
+ r = k;
}
- r = 0;
finish:
endmntent(f);
}
static int mount_load_proc_self_mountinfo(Manager *m, bool set_flags) {
- int r;
+ int r = 0;
+ unsigned i;
char *device, *path, *options, *options2, *fstype, *d, *p, *o;
assert(m);
rewind(m->proc_self_mountinfo);
- for (;;) {
+ for (i = 1;; i++) {
int k;
device = path = options = options2 = fstype = d = p = o = NULL;
"%ms " /* (5) mount point */
"%ms" /* (6) mount options */
"%*[^-]" /* (7) optional fields */
- "- " /* (8) seperator */
+ "- " /* (8) separator */
"%ms " /* (9) file system type */
"%ms" /* (10) mount source */
"%ms" /* (11) mount options 2 */
if (k == EOF)
break;
- r = -EBADMSG;
- goto finish;
+ log_warning("Failed to parse /proc/self/mountinfo:%u.", i);
+ goto clean_up;
}
if (asprintf(&o, "%s,%s", options, options2) < 0) {
goto finish;
}
- if ((r = mount_add_one(m, d, p, o, fstype, true, set_flags)) < 0)
- goto finish;
+ if ((k = mount_add_one(m, d, p, o, fstype, 0, true, set_flags)) < 0)
+ r = k;
+clean_up:
free(device);
free(path);
free(options);
free(o);
}
- r = 0;
-
finish:
free(device);
free(path);
m->mount_watch.fd = fileno(m->proc_self_mountinfo);
zero(ev);
- ev.events = EPOLLERR;
+ ev.events = EPOLLPRI;
ev.data.ptr = &m->mount_watch;
if (epoll_ctl(m->epoll_fd, EPOLL_CTL_ADD, m->mount_watch.fd, &ev) < 0)
int r;
assert(m);
- assert(events == EPOLLERR);
+ assert(events & EPOLLPRI);
/* The manager calls this for every fd event happening on the
* /proc/self/mountinfo file, which informs us about mounting
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]) {
+ LIST_FOREACH(units_by_type, meta, m->units_by_type[UNIT_MOUNT]) {
Mount *mount = (Mount*) meta;
mount->is_mounted = mount->just_mounted = mount->just_changed = false;
manager_dispatch_load_queue(m);
- LIST_FOREACH(units_per_type, meta, m->units_per_type[UNIT_MOUNT]) {
+ LIST_FOREACH(units_by_type, meta, m->units_by_type[UNIT_MOUNT]) {
Mount *mount = (Mount*) meta;
if (!mount->is_mounted) {
} else if (mount->just_mounted || mount->just_changed) {
- /* New or changed entrymount */
+ /* New or changed mount entry */
switch (mount->state) {
case MOUNT_DEAD:
- case MOUNT_MAINTENANCE:
+ case MOUNT_FAILED:
mount_enter_mounted(mount, true);
break;
}
}
-int mount_path_is_mounted(Manager *m, const char* path) {
- char *t;
- int r;
+static void mount_reset_failed(Unit *u) {
+ Mount *m = MOUNT(u);
assert(m);
- assert(path);
- if (path[0] != '/')
- return 1;
+ if (m->state == MOUNT_FAILED)
+ mount_set_state(m, MOUNT_DEAD);
- if (!(t = strdup(path)))
- return -ENOMEM;
+ m->failure = false;
+}
- path_kill_slashes(t);
+static int mount_kill(Unit *u, KillWho who, KillMode mode, int signo, DBusError *error) {
+ Mount *m = MOUNT(u);
+ int r = 0;
+ Set *pid_set = NULL;
- for (;;) {
- char *e, *slash;
- Unit *u;
+ assert(m);
- if (!(e = unit_name_from_path(t, ".mount"))) {
- r = -ENOMEM;
- goto finish;
- }
+ if (who == KILL_MAIN) {
+ dbus_set_error(error, BUS_ERROR_NO_SUCH_PROCESS, "Mount units have no main processes");
+ return -ESRCH;
+ }
- u = manager_get_unit(m, e);
- free(e);
+ if (m->control_pid <= 0 && who == KILL_CONTROL) {
+ dbus_set_error(error, BUS_ERROR_NO_SUCH_PROCESS, "No control process to kill");
+ return -ESRCH;
+ }
- if (u &&
- (MOUNT(u)->from_etc_fstab || MOUNT(u)->from_fragment) &&
- MOUNT(u)->state != MOUNT_MOUNTED) {
- r = 0;
- goto finish;
- }
+ if (who == KILL_CONTROL || who == KILL_ALL)
+ if (m->control_pid > 0)
+ if (kill(m->control_pid, signo) < 0)
+ r = -errno;
- assert_se(slash = strrchr(t, '/'));
+ if (who == KILL_ALL && mode == KILL_CONTROL_GROUP) {
+ int q;
- if (slash == t) {
- r = 1;
- goto finish;
- }
+ if (!(pid_set = set_new(trivial_hash_func, trivial_compare_func)))
+ return -ENOMEM;
- *slash = 0;
- }
+ /* Exclude the control pid from being killed via the cgroup */
+ if (m->control_pid > 0)
+ if ((q = set_put(pid_set, LONG_TO_PTR(m->control_pid))) < 0) {
+ r = q;
+ goto finish;
+ }
- r = 1;
+ if ((q = cgroup_bonding_kill_list(m->meta.cgroup_bondings, signo, false, pid_set)) < 0)
+ if (q != -EAGAIN && q != -ESRCH && q != -ENOENT)
+ r = q;
+ }
finish:
- free(t);
- return r;
-}
-
-static void mount_reset_maintenance(Unit *u) {
- Mount *m = MOUNT(u);
-
- assert(m);
-
- if (m->state == MOUNT_MAINTENANCE)
- mount_set_state(m, MOUNT_DEAD);
+ if (pid_set)
+ set_free(pid_set);
- m->failure = false;
+ return r;
}
static const char* const mount_state_table[_MOUNT_STATE_MAX] = {
[MOUNT_REMOUNTING_SIGKILL] = "remounting-sigkill",
[MOUNT_UNMOUNTING_SIGTERM] = "unmounting-sigterm",
[MOUNT_UNMOUNTING_SIGKILL] = "unmounting-sigkill",
- [MOUNT_MAINTENANCE] = "maintenance"
+ [MOUNT_FAILED] = "failed"
};
DEFINE_STRING_TABLE_LOOKUP(mount_state, MountState);
const UnitVTable mount_vtable = {
.suffix = ".mount",
+ .sections =
+ "Unit\0"
+ "Mount\0"
+ "Install\0",
.no_alias = true,
.no_instances = true,
- .no_isolate = true,
.show_status = true,
.init = mount_init,
.stop = mount_stop,
.reload = mount_reload,
+ .kill = mount_kill,
+
.serialize = mount_serialize,
.deserialize_item = mount_deserialize_item,
.sigchld_event = mount_sigchld_event,
.timer_event = mount_timer_event,
- .reset_maintenance = mount_reset_maintenance,
+ .reset_failed = mount_reset_failed,
+ .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
~ianmdlvl / elogind.git / blobdiff