static const UnitActiveState state_translation_table[_SWAP_STATE_MAX] = {
[SWAP_DEAD] = UNIT_INACTIVE,
[SWAP_ACTIVE] = UNIT_ACTIVE,
- [SWAP_MAINTENANCE] = UNIT_MAINTENANCE
+ [SWAP_FAILED] = UNIT_FAILED
};
static void swap_init(Unit *u) {
if ((r = manager_load_unit(s->meta.manager, SPECIAL_SWAP_TARGET, NULL, NULL, &tu)) < 0)
return r;
- if (!p->noauto && p->handle && s->meta.manager->running_as == MANAGER_SYSTEM)
+ if (!p->noauto &&
+ (p->handle || s->meta.manager->swap_auto) &&
+ !s->from_fragment &&
+ s->meta.manager->running_as == MANAGER_SYSTEM)
if ((r = unit_add_dependency(tu, UNIT_WANTS, UNIT(s), true)) < 0)
return r;
return unit_add_dependency(UNIT(s), UNIT_BEFORE, tu, true);
}
+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_etc_fstab)
+ p = &s->parameters_etc_fstab;
+ else
+ return 0;
+
+ return unit_add_node_link(UNIT(s), s->what,
+ !p->noauto && p->nofail &&
+ s->meta.manager->running_as == MANAGER_SYSTEM);
+}
+
static int swap_add_default_dependencies(Swap *s) {
int r;
if ((r = unit_set_description(u, s->what)) < 0)
return r;
- if ((r = unit_add_node_link(u, s->what,
- u->meta.manager->running_as == MANAGER_SYSTEM &&
- u->meta.manager->swap_on_plug)) < 0)
+
+ if ((r = swap_add_device_links(s)) < 0)
return r;
if ((r = swap_add_mount_links(s)) < 0)
const char *what,
int priority,
bool noauto,
+ bool nofail,
bool handle,
bool from_proc_swaps) {
Unit *u = NULL;
p->priority = priority;
p->noauto = noauto;
+ p->nofail = nofail;
p->handle = handle;
if (delete)
"%sWhat: %s\n"
"%sPriority: %i\n"
"%sNoAuto: %s\n"
+ "%sNoFail: %s\n"
"%sHandle: %s\n"
"%sFrom /etc/fstab: %s\n"
"%sFrom /proc/swaps: %s\n"
prefix, s->what,
prefix, p->priority,
prefix, yes_no(p->noauto),
+ prefix, yes_no(p->nofail),
prefix, yes_no(p->handle),
prefix, yes_no(s->from_etc_fstab),
prefix, yes_no(s->from_proc_swaps),
static void swap_enter_dead(Swap *s, bool success) {
assert(s);
- swap_set_state(s, success ? SWAP_DEAD : SWAP_MAINTENANCE);
+ swap_set_state(s, success ? SWAP_DEAD : SWAP_FAILED);
}
static int swap_start(Unit *u) {
int r;
assert(s);
- assert(s->state == SWAP_DEAD || s->state == SWAP_MAINTENANCE);
+ assert(s->state == SWAP_DEAD || s->state == SWAP_FAILED);
if (s->from_fragment)
priority = s->parameters_fragment.priority;
if (!d)
return -ENOMEM;
- k = swap_add_one(m, d, prio, false, false, true);
+ k = swap_add_one(m, d, prio, false, false, false, true);
free(d);
if (k < 0)
return r;
}
-static void swap_reset_maintenance(Unit *u) {
+static void swap_reset_failed(Unit *u) {
Swap *s = SWAP(u);
assert(s);
- if (s->state == SWAP_MAINTENANCE)
+ if (s->state == SWAP_FAILED)
swap_set_state(s, SWAP_DEAD);
}
static const char* const swap_state_table[_SWAP_STATE_MAX] = {
[SWAP_DEAD] = "dead",
[SWAP_ACTIVE] = "active",
- [SWAP_MAINTENANCE] = "maintenance"
+ [SWAP_FAILED] = "failed"
};
DEFINE_STRING_TABLE_LOOKUP(swap_state, SwapState);
.bus_message_handler = bus_swap_message_handler,
.bus_invalidating_properties = bus_swap_invalidating_properties,
- .reset_maintenance = swap_reset_maintenance,
+ .reset_failed = swap_reset_failed,
.enumerate = swap_enumerate,
.shutdown = swap_shutdown