X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fswap.c;h=580482fce4ae0bf1441b8c47aef3a9c53466c0f2;hb=6bda071b5cd8393b37653687027c4ae6c6cf3804;hp=faed7f681857f39b39cfa3374f80f6d690b818ae;hpb=a7b73d4a1e09f12b2002083618056f0c823c1dcf;p=libguestfs.git

diff --git a/daemon/swap.c b/daemon/swap.c
index faed7f6..580482f 100644
--- a/daemon/swap.c
+++ b/daemon/swap.c
@@ -33,12 +33,10 @@ mkswap (char *device, const char *flag, const char *value)
   char *err;
   int r;
 
-  IS_DEVICE (device, -1);
-
   if (!flag)
-    r = command (NULL, &err, "/sbin/mkswap", device, NULL);
+    r = command (NULL, &err, "/sbin/mkswap", "-f", device, NULL);
   else
-    r = command (NULL, &err, "/sbin/mkswap", flag, value, device, NULL);
+    r = command (NULL, &err, "/sbin/mkswap", "-f", flag, value, device, NULL);
 
   if (r == -1) {
     reply_with_error ("mkswap: %s", err);
@@ -68,3 +66,121 @@ do_mkswap_U (char *uuid, char *device)
 {
   return mkswap (device, "-U", uuid);
 }
+
+int
+do_mkswap_file (char *path)
+{
+  char *buf;
+  int r;
+
+  NEED_ROOT (return -1);
+  ABS_PATH (path, return -1);
+
+  buf = sysroot_path (path);
+  if (!buf) {
+    reply_with_perror ("malloc");
+    return -1;
+  }
+
+  r = mkswap (buf, NULL, NULL);
+  free (buf);
+  return r;
+}
+
+static int
+swaponoff (const char *cmd, const char *flag, const char *value)
+{
+  char *err;
+  int r;
+
+  if (!flag)
+    r = command (NULL, &err, cmd, value, NULL);
+  else
+    r = command (NULL, &err, cmd, flag, value, NULL);
+
+  if (r == -1) {
+    reply_with_error ("%s: %s: %s", cmd, value, err);
+    free (err);
+    return -1;
+  }
+
+  free (err);
+
+  return 0;
+}
+
+int
+do_swapon_device (char *device)
+{
+  return swaponoff ("/sbin/swapon", NULL, device);
+}
+
+int
+do_swapoff_device (char *device)
+{
+  return swaponoff ("/sbin/swapoff", NULL, device);
+}
+
+int
+do_swapon_file (char *path)
+{
+  char *buf;
+  int r;
+
+  NEED_ROOT (return -1);
+  ABS_PATH (path, return -1);
+
+  buf = sysroot_path (path);
+  if (!buf) {
+    reply_with_perror ("malloc");
+    return -1;
+  }
+
+  r = swaponoff ("/sbin/swapon", NULL, buf);
+  free (buf);
+  return r;
+}
+
+int
+do_swapoff_file (char *path)
+{
+  char *buf;
+  int r;
+
+  NEED_ROOT (return -1);
+  ABS_PATH (path, return -1);
+
+  buf = sysroot_path (path);
+  if (!buf) {
+    reply_with_perror ("malloc");
+    return -1;
+  }
+
+  r = swaponoff ("/sbin/swapoff", NULL, buf);
+  free (buf);
+  return r;
+}
+
+int
+do_swapon_label (char *label)
+{
+  return swaponoff ("/sbin/swapon", "-L", label);
+}
+
+int
+do_swapoff_label (char *label)
+{
+  return swaponoff ("/sbin/swapoff", "-L", label);
+}
+
+int
+do_swapon_uuid (char *uuid)
+{
+  return swaponoff ("/sbin/swapon", "-U", uuid);
+}
+
+int
+do_swapoff_uuid (char *uuid)
+{
+  return swaponoff ("/sbin/swapoff", "-U", uuid);
+}