X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fswap.c;h=2d3d9ff413bf6aec17b133ad3fd32fb786fac393;hb=949d6e79ad81db208e5181d01f01b736a271c1e5;hp=c9104e1d0281fc03e23628f398955c40d9e25b23;hpb=1997858e90da728287ef26a6d01a5766ac914312;p=libguestfs.git

diff --git a/daemon/swap.c b/daemon/swap.c
index c9104e1..2d3d9ff 100644
--- a/daemon/swap.c
+++ b/daemon/swap.c
@@ -26,9 +26,28 @@
 #include "../src/guestfs_protocol.h"
 #include "daemon.h"
 #include "actions.h"
+#include "optgroups.h"
+
+/* 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, "/sbin/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;
@@ -50,38 +69,29 @@ mkswap (char *device, const char *flag, const char *value)
 }
 
 int
-do_mkswap (char *device)
+do_mkswap (const char *device)
 {
-  RESOLVE_DEVICE (device, return -1);
-
   return mkswap (device, NULL, NULL);
 }
 
 int
-do_mkswap_L (char *label, char *device)
+do_mkswap_L (const char *label, const char *device)
 {
-  RESOLVE_DEVICE (device, return -1);
-
   return mkswap (device, "-L", label);
 }
 
 int
-do_mkswap_U (char *uuid, char *device)
+do_mkswap_U (const char *uuid, const char *device)
 {
-  RESOLVE_DEVICE (device, return -1);
-
   return mkswap (device, "-U", uuid);
 }
 
 int
-do_mkswap_file (char *path)
+do_mkswap_file (const char *path)
 {
   char *buf;
   int r;
 
-  NEED_ROOT (-1);
-  ABS_PATH (path, -1);
-
   buf = sysroot_path (path);
   if (!buf) {
     reply_with_perror ("malloc");
@@ -116,30 +126,23 @@ swaponoff (const char *cmd, const char *flag, const char *value)
 }
 
 int
-do_swapon_device (char *device)
+do_swapon_device (const char *device)
 {
-  RESOLVE_DEVICE (device, return -1);
-
   return swaponoff ("/sbin/swapon", NULL, device);
 }
 
 int
-do_swapoff_device (char *device)
+do_swapoff_device (const char *device)
 {
-  RESOLVE_DEVICE (device, return -1);
-
   return swaponoff ("/sbin/swapoff", NULL, device);
 }
 
 int
-do_swapon_file (char *path)
+do_swapon_file (const char *path)
 {
   char *buf;
   int r;
 
-  NEED_ROOT (-1);
-  ABS_PATH (path, -1);
-
   buf = sysroot_path (path);
   if (!buf) {
     reply_with_perror ("malloc");
@@ -152,14 +155,11 @@ do_swapon_file (char *path)
 }
 
 int
-do_swapoff_file (char *path)
+do_swapoff_file (const char *path)
 {
   char *buf;
   int r;
 
-  NEED_ROOT (-1);
-  ABS_PATH (path, -1);
-
   buf = sysroot_path (path);
   if (!buf) {
     reply_with_perror ("malloc");
@@ -172,25 +172,25 @@ do_swapoff_file (char *path)
 }
 
 int
-do_swapon_label (char *label)
+do_swapon_label (const char *label)
 {
   return swaponoff ("/sbin/swapon", "-L", label);
 }
 
 int
-do_swapoff_label (char *label)
+do_swapoff_label (const char *label)
 {
   return swaponoff ("/sbin/swapoff", "-L", label);
 }
 
 int
-do_swapon_uuid (char *uuid)
+do_swapon_uuid (const char *uuid)
 {
   return swaponoff ("/sbin/swapon", "-U", uuid);
 }
 
 int
-do_swapoff_uuid (char *uuid)
+do_swapoff_uuid (const char *uuid)
 {
   return swaponoff ("/sbin/swapoff", "-U", uuid);
 }