X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fswap.c;h=776b707d3a2ab61761944af629fb9f1c6528aa59;hp=ffe76881d47c3c0c3254411424af43c174835fa7;hb=c68364b790d1a13ef1df0e2fbb99ded6d67e60e3;hpb=d6c9574fb558d9e304699b1cc7522c3b133adfc9

diff --git a/src/swap.c b/src/swap.c
index ffe76881d..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,13 +113,36 @@ 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->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;
 
@@ -195,7 +218,8 @@ static int swap_load(Unit *u) {
                         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)) < 0)
+
+                if ((r = swap_add_device_links(s)) < 0)
                         return r;
 
                 if ((r = swap_add_mount_links(s)) < 0)
@@ -260,6 +284,7 @@ int swap_add_one(
                 const char *what,
                 int priority,
                 bool noauto,
+                bool nofail,
                 bool handle,
                 bool from_proc_swaps) {
         Unit *u = NULL;
@@ -309,6 +334,7 @@ int swap_add_one(
 
         p->priority = priority;
         p->noauto = noauto;
+        p->nofail = nofail;
         p->handle = handle;
 
         if (delete)
@@ -383,6 +409,7 @@ static void swap_dump(Unit *u, FILE *f, const char *prefix) {
                 "%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"
@@ -391,6 +418,7 @@ static void swap_dump(Unit *u, FILE *f, const char *prefix) {
                 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),
@@ -400,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) {
@@ -409,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;
@@ -523,7 +551,7 @@ static int swap_load_proc_swaps(Manager *m) {
                 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)
@@ -556,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);
@@ -599,9 +627,11 @@ const UnitVTable swap_vtable = {
 
         .check_gc = swap_check_gc,
 
+        .bus_interface = "org.freedesktop.systemd1.Swap",
         .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