/* 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;
-
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"))
+ STREQ (fstype, "ext4")) {
+ if (e2prog (mke2fs) == -1)
+ return -1;
argv[i++] = mke2fs;
+ }
else
argv[i++] = "mkfs";
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;
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);
}