X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fswap.c;h=776b707d3a2ab61761944af629fb9f1c6528aa59;hb=b56e57470c92f123044ea690b5404bdd730ddaa6;hp=69ccd3db6c965d9c5b0aeb91d15fc5ba6123bc1e;hpb=173a8d04fc3535b571fe4a0d4715c18be315a43a;p=elogind.git

diff --git a/src/swap.c b/src/swap.c
index 69ccd3db6..776b707d3 100644
--- a/src/swap.c
+++ b/src/swap.c
@@ -38,7 +38,7 @@
 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) {
@@ -113,7 +113,10 @@ static int swap_add_target_links(Swap *s) {
         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->swap_auto) && 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;
 
@@ -425,7 +428,7 @@ static void swap_dump(Unit *u, FILE *f, const char *prefix) {
 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) {
@@ -434,7 +437,7 @@ 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;
@@ -581,19 +584,19 @@ static int swap_enumerate(Manager *m) {
         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);
@@ -628,7 +631,7 @@ const UnitVTable swap_vtable = {
         .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