unit: use weaker dependencies between mount and device units in --user mode

[elogind.git] / src / core / swap.c

diff --git a/src/core/swap.c b/src/core/swap.c
index 1ef672f7e9e7a3ce565b57ce9597bd7ff60d3ff3..f73a8e6debb2de0657a2e4f60b79a75a38775996 100644 (file)
--- a/src/core/swap.c
+++ b/src/core/swap.c
@@ -20,24 +20,17 @@
 ***/
 
 #include <errno.h>
 ***/
 
 #include <errno.h>

-#include <limits.h>

 #include <unistd.h>
 #include <unistd.h>

-#include <fcntl.h>

 #include <sys/epoll.h>
 #include <sys/stat.h>
 #include <sys/epoll.h>
 #include <sys/stat.h>

-#include <sys/swap.h>

 #include <libudev.h>
 
 #include "unit.h"
 #include "swap.h"
 #include <libudev.h>
 
 #include "unit.h"
 #include "swap.h"

-#include "load-fragment.h"
-#include "load-dropin.h"

 #include "unit-name.h"
 #include "dbus-swap.h"
 #include "special.h"
 #include "unit-name.h"
 #include "dbus-swap.h"
 #include "special.h"

-#include "bus-common-errors.h"

 #include "exit-status.h"
 #include "exit-status.h"

-#include "def.h"

 #include "path-util.h"
 #include "virt.h"
 #include "udev-util.h"
 #include "path-util.h"
 #include "virt.h"
 #include "udev-util.h"


@@ -749,7 +742,7 @@ static void swap_enter_activating(Swap *s) {
                 if (streq(discard, "all"))
                         discard_arg = "--discard";
                 else
                 if (streq(discard, "all"))
                         discard_arg = "--discard";
                 else

-                        discard_arg = strappenda("--discard=", discard);
+                        discard_arg = strjoina("--discard=", discard);

 
                 r = exec_command_append(s->control_command, discard_arg, NULL);
                 if (r < 0)
 
                 r = exec_command_append(s->control_command, discard_arg, NULL);
                 if (r < 0)


@@ -837,7 +830,7 @@ static int swap_start(Unit *u) {
 
         s->result = SWAP_SUCCESS;
         swap_enter_activating(s);
 
         s->result = SWAP_SUCCESS;
         swap_enter_activating(s);

-        return 0;
+        return 1;

 }
 
 static int swap_stop(Unit *u) {
 }
 
 static int swap_stop(Unit *u) {


@@ -860,7 +853,7 @@ static int swap_stop(Unit *u) {
                 return -EPERM;
 
         swap_enter_deactivating(s);
                 return -EPERM;
 
         swap_enter_deactivating(s);

-        return 0;
+        return 1;

 }
 
 static int swap_serialize(Unit *u, FILE *f, FDSet *fds) {
 }
 
 static int swap_serialize(Unit *u, FILE *f, FDSet *fds) {