Generate a dummy 'Fedora' fedora.img in images directory for use by tests.

[libguestfs.git] / daemon / mkfs.c

diff --git a/daemon/mkfs.c b/daemon/mkfs.c
index 506066f..ad3014c 100644 (file)
--- a/daemon/mkfs.c
+++ b/daemon/mkfs.c
@@ -40,7 +40,7 @@ mkfs (const char *fstype, const char *device,
   int r;
   char *err;
 
-  argv[i++] = "/sbin/mkfs";
+  argv[i++] = "mkfs";
   argv[i++] = "-t";
   argv[i++] = fstype;
 
@@ -48,21 +48,21 @@ mkfs (const char *fstype, const char *device,
    * to every block and does bad block detection, neither of which
    * are useful behaviour for virtual devices.
    */
-  if (strcmp (fstype, "ntfs") == 0)
+  if (STREQ (fstype, "ntfs"))
     argv[i++] = "-Q";
 
   /* mkfs.reiserfs produces annoying interactive prompts unless you
    * tell it to be quiet.
    */
-  if (strcmp (fstype, "reiserfs") == 0)
+  if (STREQ (fstype, "reiserfs"))
     argv[i++] = "-f";
 
   /* Same for JFS. */
-  if (strcmp (fstype, "jfs") == 0)
+  if (STREQ (fstype, "jfs"))
     argv[i++] = "-f";
 
   /* For GFS, GFS2, assume a single node. */
-  if (strcmp (fstype, "gfs") == 0 || strcmp (fstype, "gfs2") == 0) {
+  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: */
@@ -83,7 +83,7 @@ mkfs (const char *fstype, const char *device,
 
   r = commandv (NULL, &err, argv);
   if (r == -1) {
-    reply_with_error ("mkfs: %s: %s: %s", fstype, device, err);
+    reply_with_error ("%s: %s: %s", fstype, device, err);
     free (err);
     return -1;
   }
@@ -102,12 +102,46 @@ int
 do_mkfs_b (const char *fstype, int blocksize, const char *device)
 {
   const char *extra[2];
-  char blocksize_s[32];
+  char n[32];
 
-  snprintf (blocksize_s, sizeof blocksize_s, "%d", blocksize);
+  if (blocksize <= 0 || !is_power_of_2 (blocksize)) {
+    reply_with_error ("block size must be > 0 and a power of 2");
+    return -1;
+  }
 
-  extra[0] = "-b";
-  extra[1] = blocksize_s;
+  if (STREQ (fstype, "vfat") ||
+      STREQ (fstype, "msdos")) {
+    /* For VFAT map the blocksize into a cluster size.  However we
+     * have to determine the block device sector size in order to do
+     * this.
+     */
+    int sectorsize = do_blockdev_getss (device);
+    if (sectorsize == -1)
+      return -1;
+
+    int sectors_per_cluster = blocksize / sectorsize;
+    if (sectors_per_cluster < 1 || sectors_per_cluster > 128) {
+      reply_with_error ("unsupported cluster size for %s filesystem (requested cluster size = %d, sector size = %d, trying sectors per cluster = %d)",
+                        fstype, blocksize, sectorsize, sectors_per_cluster);
+      return -1;
+    }
+
+    snprintf (n, sizeof n, "%d", sectors_per_cluster);
+    extra[0] = "-s";
+    extra[1] = n;
+  }
+  else if (STREQ (fstype, "ntfs")) {
+    /* For NTFS map the blocksize into a cluster size. */
+    snprintf (n, sizeof n, "%d", blocksize);
+    extra[0] = "-c";
+    extra[1] = n;
+  }
+  else {
+    /* For all other filesystem types, try the -b option. */
+    snprintf (n, sizeof n, "%d", blocksize);
+    extra[0] = "-b";
+    extra[1] = n;
+  }
 
   return mkfs (fstype, device, extra, 2);
 }