X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fmkfs.c;h=8bb7341f8ba64a90cc9793c4c9a9e6301aee51b0;hb=e494a59921456d854a070612dad3e7c1e83f30a1;hp=911fad3dadca432d49a3a6092e036496593020dd;hpb=0710326ac5f1a06cf1dc3500617d04cf4cba5631;p=libguestfs.git

diff --git a/daemon/mkfs.c b/daemon/mkfs.c
index 911fad3..8bb7341 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
@@ -36,15 +36,35 @@ int
 do_mkfs_opts (const char *fstype, const char *device, int blocksize)
 {
   const char *argv[MAX_ARGS];
-  size_t i = 0, j;
+  size_t i = 0;
   char blocksize_str[32];
   int r;
   char *err;
+  char mke2fs[] = "mke2fs";
+
+  /* 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")) {
+    if (e2prog (mke2fs) == -1)
+      return -1;
+    argv[i++] = mke2fs;
+  }
+  else
+    argv[i++] = "mkfs";
 
-  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.