X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fswap.c;h=907781449da95a9b23053279fe0cbef22a3074b0;hp=7dac96e5900dfaff2ee01ea5294b501426ab9c4d;hb=428a45c3e15f03e9861e1b551e1ae8da821dba5f;hpb=662617ae725c5e41c24128a037060419fbe4b026

diff --git a/daemon/swap.c b/daemon/swap.c
index 7dac96e..9077814 100644
--- a/daemon/swap.c
+++ b/daemon/swap.c
@@ -1,5 +1,5 @@
 /* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc. 
+ * Copyright (C) 2009 Red Hat Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,25 +23,45 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "../src/guestfs_protocol.h"
+#include "guestfs_protocol.h"
 #include "daemon.h"
 #include "actions.h"
+#include "optgroups.h"
+
+/* Confirmed this is true for Linux swap partitions from the Linux sources. */
+#define SWAP_LABEL_MAX 16
+
+/* Convenient place to test for the later version of e2fsprogs
+ * and util-linux which supports -U parameters to specify UUIDs.
+ * (Not supported in RHEL 5).
+ */
+int
+optgroup_linuxfsuuid_available (void)
+{
+  char *err;
+  int av;
+
+  /* Ignore return code - mkswap --help *will* fail. */
+  command (NULL, &err, "mkswap", "--help", NULL);
+
+  av = strstr (err, "-U") != NULL;
+  free (err);
+  return av;
+}
 
 static int
-mkswap (char *device, const char *flag, const char *value)
+mkswap (const 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, "mkswap", "-f", device, NULL);
   else
-    r = command (NULL, &err, "/sbin/mkswap", flag, value, device, NULL);
+    r = command (NULL, &err, "mkswap", "-f", flag, value, device, NULL);
 
   if (r == -1) {
-    reply_with_error ("mkswap: %s", err);
+    reply_with_error ("%s", err);
     free (err);
     return -1;
   }
@@ -52,19 +72,151 @@ mkswap (char *device, const char *flag, const char *value)
 }
 
 int
-do_mkswap (char *device)
+do_mkswap (const char *device)
 {
   return mkswap (device, NULL, NULL);
 }
 
 int
-do_mkswap_L (char *label, char *device)
+do_mkswap_L (const char *label, const char *device)
 {
+  if (strlen (label) > SWAP_LABEL_MAX) {
+    reply_with_error ("%s: Linux swap labels are limited to %d bytes",
+                      label, SWAP_LABEL_MAX);
+    return -1;
+  }
+
   return mkswap (device, "-L", label);
 }
 
 int
-do_mkswap_U (char *uuid, char *device)
+do_mkswap_U (const char *uuid, const char *device)
 {
   return mkswap (device, "-U", uuid);
 }
+
+int
+do_mkswap_file (const char *path)
+{
+  char *buf;
+  int r;
+
+  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", value, err);
+    free (err);
+    return -1;
+  }
+
+  free (err);
+
+  /* Possible fix for RHBZ#516096.  It probably doesn't hurt to do
+   * this in any case.
+   */
+  udev_settle ();
+
+  return 0;
+}
+
+int
+do_swapon_device (const char *device)
+{
+  return swaponoff ("swapon", NULL, device);
+}
+
+int
+do_swapoff_device (const char *device)
+{
+  return swaponoff ("swapoff", NULL, device);
+}
+
+int
+do_swapon_file (const char *path)
+{
+  char *buf;
+  int r;
+
+  buf = sysroot_path (path);
+  if (!buf) {
+    reply_with_perror ("malloc");
+    return -1;
+  }
+
+  r = swaponoff ("swapon", NULL, buf);
+  free (buf);
+  return r;
+}
+
+int
+do_swapoff_file (const char *path)
+{
+  char *buf;
+  int r;
+
+  buf = sysroot_path (path);
+  if (!buf) {
+    reply_with_perror ("malloc");
+    return -1;
+  }
+
+  r = swaponoff ("swapoff", NULL, buf);
+  free (buf);
+  return r;
+}
+
+int
+do_swapon_label (const char *label)
+{
+  if (strlen (label) > SWAP_LABEL_MAX) {
+    reply_with_error ("%s: Linux swap labels are limited to %d bytes",
+                      label, SWAP_LABEL_MAX);
+    return -1;
+  }
+
+  return swaponoff ("swapon", "-L", label);
+}
+
+int
+do_swapoff_label (const char *label)
+{
+  if (strlen (label) > SWAP_LABEL_MAX) {
+    reply_with_error ("%s: Linux swap labels are limited to %d bytes",
+                      label, SWAP_LABEL_MAX);
+    return -1;
+  }
+
+  return swaponoff ("swapoff", "-L", label);
+}
+
+int
+do_swapon_uuid (const char *uuid)
+{
+  return swaponoff ("swapon", "-U", uuid);
+}
+
+int
+do_swapoff_uuid (const char *uuid)
+{
+  return swaponoff ("swapoff", "-U", uuid);
+}