X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fswap.c;h=1add722bf13db58cf4869f63380cebd90c493bf8;hb=f1f00dbb7f3741b30d4a26b1a8b65ec46ff1fde3;hp=ef90d0efde1d2e19f1ebced13d579b1fad9a2ab1;hpb=cdc8982030271785d650af410230397bbb5a4be9;p=elogind.git diff --git a/src/core/swap.c b/src/core/swap.c index ef90d0efd..1add722bf 100644 --- a/src/core/swap.c +++ b/src/core/swap.c @@ -152,8 +152,8 @@ static void swap_done(Unit *u) { free(s->parameters_fragment.what); s->parameters_fragment.what = NULL; - free(s->parameters_fragment.discard); - s->parameters_fragment.discard = NULL; + free(s->parameters_fragment.options); + s->parameters_fragment.options = NULL; s->exec_runtime = exec_runtime_unref(s->exec_runtime); exec_command_done_array(s->exec_command, _SWAP_EXEC_COMMAND_MAX); @@ -191,20 +191,16 @@ static int swap_arm_timer(Swap *s) { } static int swap_add_device_links(Swap *s) { - SwapParameters *p; - assert(s); if (!s->what) return 0; - if (s->from_fragment) - p = &s->parameters_fragment; - else + if (!s->from_fragment) return 0; if (is_device_path(s->what)) - return unit_add_node_link(UNIT(s), s->what, !p->noauto && UNIT(s)->manager->running_as == SYSTEMD_SYSTEM); + return unit_add_node_link(UNIT(s), s->what, UNIT(s)->manager->running_as == SYSTEMD_SYSTEM); else /* File based swap devices need to be ordered after * systemd-remount-fs.service, since they might need a @@ -213,7 +209,6 @@ static int swap_add_device_links(Swap *s) { } static int swap_add_default_dependencies(Swap *s) { - bool nofail = false, noauto = false; int r; assert(s); @@ -228,23 +223,15 @@ static int swap_add_default_dependencies(Swap *s) { if (r < 0) return r; - if (s->from_fragment) { - SwapParameters *p = &s->parameters_fragment; - - nofail = p->nofail; - noauto = p->noauto; - } - - if (!noauto) { - if (nofail) - r = unit_add_dependency_by_name_inverse(UNIT(s), UNIT_WANTS, SPECIAL_SWAP_TARGET, NULL, true); - else - r = unit_add_two_dependencies_by_name_inverse(UNIT(s), UNIT_AFTER, UNIT_REQUIRES, SPECIAL_SWAP_TARGET, NULL, true); - if (r < 0) - return r; - } + if (!s->from_fragment) + /* The swap unit can either be for an alternative device name, in which + * case we don't need to add the dependency on swap.target because this unit + * is following a different unit which will have this dependency added, + * or it can be derived from /proc/swaps, in which case it was started + * manually, and should not become a dependency of swap.target. */ + return 0; - return 0; + return unit_add_two_dependencies_by_name_inverse(UNIT(s), UNIT_AFTER, UNIT_REQUIRES, SPECIAL_SWAP_TARGET, NULL, true); } static int swap_verify(Swap *s) { @@ -369,8 +356,6 @@ static int swap_add_one( const char *what, const char *what_proc_swaps, int priority, - bool noauto, - bool nofail, bool set_flags) { _cleanup_free_ char *e = NULL; @@ -433,8 +418,6 @@ static int swap_add_one( SWAP(u)->from_proc_swaps = true; p->priority = priority; - p->noauto = noauto; - p->nofail = nofail; unit_add_to_dbus_queue(u); @@ -458,7 +441,7 @@ static int swap_process_new_swap(Manager *m, const char *device, int prio, bool assert(m); - r = swap_add_one(m, device, device, prio, false, false, set_flags); + r = swap_add_one(m, device, device, prio, set_flags); if (r < 0) return r; @@ -474,7 +457,7 @@ static int swap_process_new_swap(Manager *m, const char *device, int prio, bool /* Add the main device node */ dn = udev_device_get_devnode(d); if (dn && !streq(dn, device)) - swap_add_one(m, dn, device, prio, false, false, set_flags); + swap_add_one(m, dn, device, prio, set_flags); /* Add additional units for all symlinks */ first = udev_device_get_devlinks_list_entry(d); @@ -495,7 +478,7 @@ static int swap_process_new_swap(Manager *m, const char *device, int prio, bool st.st_rdev != udev_device_get_devnum(d)) continue; - swap_add_one(m, p, device, prio, false, false, set_flags); + swap_add_one(m, p, device, prio, set_flags); } return r; @@ -604,13 +587,9 @@ static void swap_dump(Unit *u, FILE *f, const char *prefix) { if (p) fprintf(f, "%sPriority: %i\n" - "%sNoAuto: %s\n" - "%sNoFail: %s\n" - "%sDiscard: %s\n", + "%sOptions: %s\n", prefix, p->priority, - prefix, yes_no(p->noauto), - prefix, yes_no(p->nofail), - prefix, p->discard ?: "none"); + prefix, strempty(p->options)); if (s->control_pid > 0) fprintf(f, @@ -708,7 +687,8 @@ static void swap_enter_signal(Swap *s, SwapState state, SwapResult f) { r = unit_kill_context( UNIT(s), &s->kill_context, - state != SWAP_ACTIVATING_SIGTERM && state != SWAP_DEACTIVATING_SIGTERM, + (state != SWAP_ACTIVATING_SIGTERM && state != SWAP_DEACTIVATING_SIGTERM) ? + KILL_KILL : KILL_TERMINATE, -1, s->control_pid, false); @@ -737,9 +717,74 @@ fail: swap_enter_dead(s, SWAP_FAILURE_RESOURCES); } +static int mount_find_pri(const char *options, int *ret) { + const char *opt; + char *end; + unsigned long r; + + assert(ret); + + if (!options) + return 0; + + opt = mount_test_option(options, "pri"); + if (!opt) + return 0; + + opt += strlen("pri"); + if (*opt != '=') + return -EINVAL; + + errno = 0; + r = strtoul(opt + 1, &end, 10); + if (errno > 0) + return -errno; + + if (end == opt + 1 || (*end != ',' && *end != 0)) + return -EINVAL; + + *ret = (int) r; + return 1; +} + +static int mount_find_discard(const char *options, char **ret) { + const char *opt; + char *ans; + size_t len; + + assert(ret); + + if (!options) + return 0; + + opt = mount_test_option(options, "discard"); + if (!opt) + return 0; + + opt += strlen("discard"); + if (*opt == ',' || *opt == '\0') + ans = strdup("all"); + else { + if (*opt != '=') + return -EINVAL; + + len = strcspn(opt + 1, ","); + if (len == 0) + return -EINVAL; + + ans = strndup(opt + 1, len); + } + + if (!ans) + return -ENOMEM; + + *ret = ans; + return 1; +} + static void swap_enter_activating(Swap *s) { - int r, priority; - char *discard; + _cleanup_free_ char *discard = NULL; + int r, priority = -1; assert(s); @@ -747,11 +792,11 @@ static void swap_enter_activating(Swap *s) { s->control_command = s->exec_command + SWAP_EXEC_ACTIVATE; if (s->from_fragment) { + mount_find_discard(s->parameters_fragment.options, &discard); + priority = s->parameters_fragment.priority; - discard = s->parameters_fragment.discard; - } else { - priority = -1; - discard = NULL; + if (priority < 0) + mount_find_pri(s->parameters_fragment.options, &priority); } r = exec_command_set(s->control_command, "/sbin/swapon", NULL); @@ -768,9 +813,11 @@ static void swap_enter_activating(Swap *s) { } if (discard && !streq(discard, "none")) { - const char *discard_arg = "--discard"; + const char *discard_arg; - if (!streq(discard, "all")) + if (streq(discard, "all")) + discard_arg = "--discard"; + else discard_arg = strappenda("--discard=", discard); r = exec_command_append(s->control_command, discard_arg, NULL);