X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fswap.c;h=4404dc0e7111f8dfc0e100af916779c29536f561;hp=cf9644fc69a860e0658e33c10ab8d0410ef13e5c;hb=510051fc1264ace4ab657b52ec6fb5e2ccfda740;hpb=4e4343146ade25b1ccfc927e2807d854be863ec4

diff --git a/src/swap.c b/src/swap.c
index cf9644fc6..4404dc0e7 100644
--- a/src/swap.c
+++ b/src/swap.c
@@ -35,6 +35,7 @@
 #include "unit-name.h"
 #include "dbus-swap.h"
 #include "special.h"
+#include "bus-errors.h"
 
 static const UnitActiveState state_translation_table[_SWAP_STATE_MAX] = {
         [SWAP_DEAD] = UNIT_INACTIVE,
@@ -175,7 +176,7 @@ static int swap_add_target_links(Swap *s) {
 
         if (!p->noauto &&
             (p->handle || s->meta.manager->swap_auto) &&
-            !s->from_fragment &&
+            s->from_etc_fstab &&
             s->meta.manager->running_as == MANAGER_SYSTEM)
                 if ((r = unit_add_dependency(tu, UNIT_WANTS, UNIT(s), true)) < 0)
                         return r;
@@ -282,7 +283,6 @@ static int swap_load(Unit *u) {
                         if ((r = unit_set_description(u, s->what)) < 0)
                                 return r;
 
-
                 if ((r = swap_add_device_links(s)) < 0)
                         return r;
 
@@ -292,6 +292,9 @@ static int swap_load(Unit *u) {
                 if ((r = swap_add_target_links(s)) < 0)
                         return r;
 
+                if ((r = unit_add_default_cgroup(u)) < 0)
+                        return r;
+
                 if (s->meta.default_dependencies)
                         if ((r = swap_add_default_dependencies(s)) < 0)
                                 return r;
@@ -1213,6 +1216,52 @@ static void swap_reset_failed(Unit *u) {
         s->failure = false;
 }
 
+static int swap_kill(Unit *u, KillWho who, KillMode mode, int signo, DBusError *error) {
+        Swap *s = SWAP(u);
+        int r = 0;
+        Set *pid_set = NULL;
+
+        assert(s);
+
+        if (who == KILL_MAIN) {
+                dbus_set_error(error, BUS_ERROR_NO_SUCH_PROCESS, "Swap units have no main processes");
+                return -EINVAL;
+        }
+
+        if (s->control_pid <= 0 && who == KILL_CONTROL) {
+                dbus_set_error(error, BUS_ERROR_NO_SUCH_PROCESS, "No control process to kill");
+                return -ENOENT;
+        }
+
+        if (s->control_pid > 0)
+                if (kill(mode == KILL_PROCESS_GROUP ? -s->control_pid : s->control_pid, signo) < 0)
+                        r = -errno;
+
+        if (mode == KILL_CONTROL_GROUP) {
+                int q;
+
+                if (!(pid_set = set_new(trivial_hash_func, trivial_compare_func)))
+                        return -ENOMEM;
+
+                /* Exclude the control pid from being killed via the cgroup */
+                if (s->control_pid > 0)
+                        if ((q = set_put(pid_set, LONG_TO_PTR(s->control_pid))) < 0) {
+                                r = q;
+                                goto finish;
+                        }
+
+                if ((q = cgroup_bonding_kill_list(s->meta.cgroup_bondings, signo, pid_set)) < 0)
+                        if (r != -EAGAIN && r != -ESRCH && r != -ENOENT)
+                                r = q;
+        }
+
+finish:
+        if (pid_set)
+                set_free(pid_set);
+
+        return r;
+}
+
 static const char* const swap_state_table[_SWAP_STATE_MAX] = {
         [SWAP_DEAD] = "dead",
         [SWAP_ACTIVATING] = "activating",
@@ -1253,6 +1302,8 @@ const UnitVTable swap_vtable = {
         .start = swap_start,
         .stop = swap_stop,
 
+        .kill = swap_kill,
+
         .serialize = swap_serialize,
         .deserialize_item = swap_deserialize_item,