mkfs-opts: Add optional sectorsize parameter.

1 files changed, 20 insertions, 3 deletions

diff --git a/daemon/mkfs.c b/daemon/mkfs.c
index 64762fb2..353d8fac 100644
--- a/daemon/mkfs.c
+++ b/daemon/mkfs.c
@@ -34,12 +34,13 @@
 /* Takes optional arguments, consult optargs_bitmask. */
 int
 do_mkfs_opts (const char *fstype, const char *device, int blocksize,
-              const char *features, int inode)
+              const char *features, int inode, int sectorsize)
 {
   const char *argv[MAX_ARGS];
   size_t i = 0;
   char blocksize_str[32];
   char inode_str[32];
+  char sectorsize_str[32];
   int r;
   char *err;
 
@@ -159,6 +160,22 @@ do_mkfs_opts (const char *fstype, const char *device, int blocksize,
     argv[i++] = inode_str;
   }
 
+  if (optargs_bitmask & GUESTFS_MKFS_OPTS_SECTORSIZE_BITMASK) {
+    if (!STREQ (fstype, "ufs")) {
+      reply_with_error ("sector size (-S) can only be set on ufs filesystems");
+      return -1;
+    }
+
+    if (sectorsize <= 0) {
+      reply_with_error ("sector size must be larger than zero");
+      return -1;
+    }
+
+    snprintf (sectorsize_str, sizeof sectorsize_str, "%d", sectorsize);
+    argv[i++] = "-S";
+    argv[i++] = sectorsize_str;
+  }
+
   argv[i++] = device;
   argv[i++] = NULL;
 
@@ -180,12 +197,12 @@ int
 do_mkfs (const char *fstype, const char *device)
 {
   optargs_bitmask = 0;
-  return do_mkfs_opts (fstype, device, 0, 0, 0);
+  return do_mkfs_opts (fstype, device, 0, 0, 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, 0, 0);
+  return do_mkfs_opts (fstype, device, blocksize, 0, 0, 0);
 }