Implement 'mkswap', 'mkswap_L' and 'mkswap_U' commands.

These commands are used to make Linux swap devices.  The mkswap_L
command makes one with a label.  The mkswap_U command makes one
with a known UUID.

diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 88c382c..d69f899 100644 (file)
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -56,6 +56,7 @@ guestfsd_SOURCES = \
        stat.c \
        strings.c \
        stubs.c \
        stat.c \
        strings.c \
        stubs.c \

+       swap.c \

        sync.c \
        tar.c \
        upload.c \
        sync.c \
        tar.c \
        upload.c \

diff --git a/daemon/swap.c b/daemon/swap.c
new file mode 100644 (file)
index 0000000..7dac96e
--- /dev/null
+++ b/daemon/swap.c
@@ -0,0 +1,70 @@
+/* libguestfs - the guestfsd daemon
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <config.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "../src/guestfs_protocol.h"
+#include "daemon.h"
+#include "actions.h"
+
+static int
+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);
+  else
+    r = command (NULL, &err, "/sbin/mkswap", flag, value, device, NULL);
+
+  if (r == -1) {
+    reply_with_error ("mkswap: %s", err);
+    free (err);
+    return -1;
+  }
+
+  free (err);
+
+  return 0;
+}
+
+int
+do_mkswap (char *device)
+{
+  return mkswap (device, NULL, NULL);
+}
+
+int
+do_mkswap_L (char *label, char *device)
+{
+  return mkswap (device, "-L", label);
+}
+
+int
+do_mkswap_U (char *uuid, char *device)
+{
+  return mkswap (device, "-U", uuid);
+}

diff --git a/src/generator.ml b/src/generator.ml
index 27a7586..da18ccf 100755 (executable)
--- a/src/generator.ml
+++ b/src/generator.ml
@@ -2623,6 +2623,30 @@ This command lets you mount C<file> (a filesystem image
 in a file) on a mount point.  It is entirely equivalent to
 the command C<mount -o loop file mountpoint>.");
 
 in a file) on a mount point.  It is entirely equivalent to
 the command C<mount -o loop file mountpoint>.");
 

+  ("mkswap", (RErr, [String "device"]), 130, [],
+   [InitEmpty, Always, TestRun (
+      [["sfdisk"; "/dev/sda"; "0"; "0"; "0"; ","];
+       ["mkswap"; "/dev/sda1"]])],
+   "create a swap partition",
+   "\
+Create a swap partition on C<device>.");
+
+  ("mkswap_L", (RErr, [String "label"; String "device"]), 131, [],
+   [InitEmpty, Always, TestRun (
+      [["sfdisk"; "/dev/sda"; "0"; "0"; "0"; ","];
+       ["mkswap_L"; "hello"; "/dev/sda1"]])],
+   "create a swap partition with a label",
+   "\
+Create a swap partition on C<device> with label C<label>.");
+
+  ("mkswap_U", (RErr, [String "uuid"; String "device"]), 132, [],
+   [InitEmpty, Always, TestRun (
+      [["sfdisk"; "/dev/sda"; "0"; "0"; "0"; ","];
+       ["mkswap_U"; "a3a61220-882b-4f61-89f4-cf24dcc7297d"; "/dev/sda1"]])],
+   "create a swap partition with an explicit UUID",
+   "\
+Create a swap partition on C<device> with UUID C<uuid>.");
+

 ]
 
 let all_functions = non_daemon_functions @ daemon_functions
 ]
 
 let all_functions = non_daemon_functions @ daemon_functions