X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fswap.c;h=bcc5f1b13529e76228c627e3ede30ad91da78538;hb=62b322872543c2ec069ac4fb0103ab758f587cef;hp=db93e573de01cd62eb3d1d74fb8c10cf01732059;hpb=77b2275dfcebce16ceea17ddf77a7f9d0a41c082;p=libguestfs.git

diff --git a/daemon/swap.c b/daemon/swap.c
index db93e57..bcc5f1b 100644
--- a/daemon/swap.c
+++ b/daemon/swap.c
@@ -28,15 +28,15 @@
 #include "actions.h"
 
 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;
 
   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);
@@ -50,38 +50,29 @@ mkswap (char *device, const char *flag, const char *value)
 }
 
 int
-do_mkswap (char *device)
+do_mkswap (const char *device)
 {
-  IS_DEVICE (device, -1);
-
   return mkswap (device, NULL, NULL);
 }
 
 int
-do_mkswap_L (char *label, char *device)
+do_mkswap_L (const char *label, const char *device)
 {
-  IS_DEVICE (device, -1);
-
   return mkswap (device, "-L", label);
 }
 
 int
-do_mkswap_U (char *uuid, char *device)
+do_mkswap_U (const char *uuid, const char *device)
 {
-  IS_DEVICE (device, -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 +107,23 @@ swaponoff (const char *cmd, const char *flag, const char *value)
 }
 
 int
-do_swapon_device (char *device)
+do_swapon_device (const char *device)
 {
-  IS_DEVICE (device, -1);
-
   return swaponoff ("/sbin/swapon", NULL, device);
 }
 
 int
-do_swapoff_device (char *device)
+do_swapoff_device (const char *device)
 {
-  IS_DEVICE (device, -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 +136,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 +153,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);
 }