mkfs-opts: Add optional sectorsize parameter.

diff --git a/daemon/mkfs.c b/daemon/mkfs.c
index 64762fb..353d8fa 100644 (file)
--- 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,
 /* 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];
 {
   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;
 
   int r;
   char *err;
 


@@ -159,6 +160,22 @@ do_mkfs_opts (const char *fstype, const char *device, int blocksize,
     argv[i++] = inode_str;
   }
 
     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;
 
   argv[i++] = device;
   argv[i++] = NULL;
 


@@ -180,12 +197,12 @@ int
 do_mkfs (const char *fstype, const char *device)
 {
   optargs_bitmask = 0;
 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;
 }
 
 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);

 }
 }

diff --git a/generator/generator_actions.ml b/generator/generator_actions.ml
index 2e7ed75..ef51166 100644 (file)
--- a/generator/generator_actions.ml
+++ b/generator/generator_actions.ml
@@ -5838,10 +5838,10 @@ not refer to a logical volume.
 
 See also C<guestfs_is_lv>.");
 
 
 See also C<guestfs_is_lv>.");
 

-  ("mkfs_opts", (RErr, [String "fstype"; Device "device"], [Int "blocksize"; String "features"; Int "inode"]), 278, [],
+  ("mkfs_opts", (RErr, [String "fstype"; Device "device"], [Int "blocksize"; String "features"; Int "inode"; Int "sectorsize"]), 278, [],

    [InitEmpty, Always, TestOutput (
       [["part_disk"; "/dev/sda"; "mbr"];
    [InitEmpty, Always, TestOutput (
       [["part_disk"; "/dev/sda"; "mbr"];

-       ["mkfs_opts"; "ext2"; "/dev/sda1"; "4096"; ""; "256"];
+       ["mkfs_opts"; "ext2"; "/dev/sda1"; "4096"; ""; "256"; ""];

        ["mount_options"; ""; "/dev/sda1"; "/"];
        ["write"; "/new"; "new file contents"];
        ["cat"; "/new"]], "new file contents")],
        ["mount_options"; ""; "/dev/sda1"; "/"];
        ["write"; "/new"; "new file contents"];
        ["cat"; "/new"]], "new file contents")],


@@ -5881,6 +5881,11 @@ C<gfs2> filesystem type.
 This passes the I<-I> parameter to the external L<mke2fs(8)> program
 which sets the inode size (only for ext2/3/4 filesystems at present).
 
 This passes the I<-I> parameter to the external L<mke2fs(8)> program
 which sets the inode size (only for ext2/3/4 filesystems at present).
 

+=item C<sectorsize>
+
+This passes the I<-S> parameter to external L<mkfs.ufs(8)> program,
+which sets sector size for ufs filesystem.
+

 =back");
 
   ("getxattr", (RBufferOut "xattr", [Pathname "path"; String "name"], []), 279, [Optional "linuxxattrs"],
 =back");
 
   ("getxattr", (RBufferOut "xattr", [Pathname "path"; String "name"], []), 279, [Optional "linuxxattrs"],