X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fmkfs.c;h=ba245b322544c6bdd1d229ee3b3078bda9babec8;hp=73fd860e8ef00356e11ccbd91d84cad4d7dfb4da;hb=b3035e8d7c04a71d9a54ab7e52bc9e169ecf0b47;hpb=a61bccecfba1c9501910d28de24bac945e95001f

diff --git a/daemon/mkfs.c b/daemon/mkfs.c
index 73fd860..ba245b3 100644
--- a/daemon/mkfs.c
+++ b/daemon/mkfs.c
@@ -29,15 +29,61 @@
 #include "daemon.h"
 #include "actions.h"
 
-int
-do_mkfs (const char *fstype, const char *device)
+#define MAX_ARGS 16
+
+static int
+mkfs (const char *fstype, const char *device,
+      const char **extra, size_t nr_extra)
 {
-  char *err;
+  const char *argv[MAX_ARGS];
+  size_t i = 0, j;
   int r;
+  char *err;
+
+  argv[i++] = "/sbin/mkfs";
+  argv[i++] = "-t";
+  argv[i++] = fstype;
+
+  /* mkfs.ntfs requires the -Q argument otherwise it writes zeroes
+   * to every block and does bad block detection, neither of which
+   * are useful behaviour for virtual devices.
+   */
+  if (STREQ (fstype, "ntfs"))
+    argv[i++] = "-Q";
+
+  /* mkfs.reiserfs produces annoying interactive prompts unless you
+   * tell it to be quiet.
+   */
+  if (STREQ (fstype, "reiserfs"))
+    argv[i++] = "-f";
 
-  r = command (NULL, &err, "/sbin/mkfs", "-t", fstype, device, NULL);
+  /* Same for JFS. */
+  if (STREQ (fstype, "jfs"))
+    argv[i++] = "-f";
+
+  /* For GFS, GFS2, assume a single node. */
+  if (STREQ (fstype, "gfs") || STREQ (fstype, "gfs2")) {
+    argv[i++] = "-p";
+    argv[i++] = "lock_nolock";
+    /* The man page says this is default, but it doesn't seem to be: */
+    argv[i++] = "-j";
+    argv[i++] = "1";
+    /* Don't ask questions: */
+    argv[i++] = "-O";
+  }
+
+  for (j = 0; j < nr_extra; ++j)
+    argv[i++] = extra[j];
+
+  argv[i++] = device;
+  argv[i++] = NULL;
+
+  if (i > MAX_ARGS)
+    abort ();
+
+  r = commandv (NULL, &err, argv);
   if (r == -1) {
-    reply_with_error ("mkfs: %s", err);
+    reply_with_error ("mkfs: %s: %s: %s", fstype, device, err);
     free (err);
     return -1;
   }
@@ -47,22 +93,21 @@ do_mkfs (const char *fstype, const char *device)
 }
 
 int
-do_mkfs_b (const char *fstype, int blocksize, const char *device)
+do_mkfs (const char *fstype, const char *device)
 {
-  char *err;
-  int r;
+  return mkfs (fstype, device, NULL, 0);
+}
 
+int
+do_mkfs_b (const char *fstype, int blocksize, const char *device)
+{
+  const char *extra[2];
   char blocksize_s[32];
+
   snprintf (blocksize_s, sizeof blocksize_s, "%d", blocksize);
 
-  r = command (NULL, &err,
-	       "/sbin/mkfs", "-t", fstype, "-b", blocksize_s, device, NULL);
-  if (r == -1) {
-    reply_with_error ("mkfs_b: %s", err);
-    free (err);
-    return -1;
-  }
+  extra[0] = "-b";
+  extra[1] = blocksize_s;
 
-  free (err);
-  return 0;
+  return mkfs (fstype, device, extra, 2);
 }