X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fmkfs.c;h=cd2726867fc92d5ea208d87a5f0240c10dbdd517;hb=d600d53868237e0f2828a912d9672dbd480e315f;hp=cc0ead182ee76d7c33b0e0e3c516dfaf30c39208;hpb=d72815578f7b8fea9702902d8562430e8a007a46;p=libguestfs.git

diff --git a/daemon/mkfs.c b/daemon/mkfs.c
index cc0ead1..cd27268 100644
--- a/daemon/mkfs.c
+++ b/daemon/mkfs.c
@@ -1,5 +1,5 @@
 /* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009-2011 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
@@ -33,7 +33,7 @@
 
 /* Takes optional arguments, consult optargs_bitmask. */
 int
-do_mkfs_opts (const char *fstype, const char *device, int blocksize)
+do_mkfs_opts (const char *fstype, const char *device, int blocksize, const char *features)
 {
   const char *argv[MAX_ARGS];
   size_t i = 0;
@@ -41,10 +41,30 @@ do_mkfs_opts (const char *fstype, const char *device, int blocksize)
   int r;
   char *err;
 
-  argv[i++] = "mkfs";
+  char mke2fs[] = "mke2fs";
+  if (e2prog (mke2fs) == -1)
+    return -1;
+
+  /* For ext2/3/4 run the mke2fs program directly.  This is because
+   * the mkfs program "eats" some options, in particular the -F
+   * option.
+   */
+  if (STREQ (fstype, "ext2") || STREQ (fstype, "ext3") ||
+      STREQ (fstype, "ext4"))
+    argv[i++] = mke2fs;
+  else
+    argv[i++] = "mkfs";
+
   argv[i++] = "-t";
   argv[i++] = fstype;
 
+  /* Force mke2fs to create a filesystem, even if it thinks it
+   * shouldn't (RHBZ#690819).
+   */
+  if (STREQ (fstype, "ext2") || STREQ (fstype, "ext3") ||
+      STREQ (fstype, "ext4"))
+    argv[i++] = "-F";
+
   /* 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.
@@ -115,6 +135,11 @@ do_mkfs_opts (const char *fstype, const char *device, int blocksize)
     }
   }
 
+  if (optargs_bitmask & GUESTFS_MKFS_OPTS_FEATURES_BITMASK) {
+     argv[i++] = "-O";
+     argv[i++] = features;
+  }
+
   argv[i++] = device;
   argv[i++] = NULL;
 
@@ -136,12 +161,12 @@ int
 do_mkfs (const char *fstype, const char *device)
 {
   optargs_bitmask = 0;
-  return do_mkfs_opts (fstype, device, 0);
+  return do_mkfs_opts (fstype, device, 0, 0);
 }
 
 int
 do_mkfs_b (const char *fstype, int blocksize, const char *device)
 {
   optargs_bitmask = GUESTFS_MKFS_OPTS_BLOCKSIZE_BITMASK;
-  return do_mkfs_opts (fstype, device, blocksize);
+  return do_mkfs_opts (fstype, device, blocksize, 0);
 }