/* 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
/* Takes optional arguments, consult optargs_bitmask. */
int
-do_mkfs_opts (const char *fstype, const char *device, int blocksize)
+do_mkfs_opts (const char *fstype, const char *device, int blocksize,
+ const char *features, int inode, int sectorsize)
{
const char *argv[MAX_ARGS];
- size_t i = 0, j;
+ size_t i = 0;
char blocksize_str[32];
+ char inode_str[32];
+ char sectorsize_str[32];
int r;
char *err;
- argv[i++] = "mkfs";
+ 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"))
+ argv[i++] = mke2fs;
+ else
+ 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.
}
}
+ if (optargs_bitmask & GUESTFS_MKFS_OPTS_FEATURES_BITMASK) {
+ argv[i++] = "-O";
+ argv[i++] = features;
+ }
+
+ if (optargs_bitmask & GUESTFS_MKFS_OPTS_INODE_BITMASK) {
+ if (!STREQ (fstype, "ext2") && !STREQ (fstype, "ext3") &&
+ !STREQ (fstype, "ext4")) {
+ reply_with_error ("inode size (-I) can only be set on ext2/3/4 filesystems");
+ return -1;
+ }
+
+ if (inode <= 0) {
+ reply_with_error ("inode size must be larger than zero");
+ return -1;
+ }
+
+ snprintf (inode_str, sizeof inode_str, "%d", inode);
+ argv[i++] = "-I";
+ 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);
+ 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);
+ return do_mkfs_opts (fstype, device, blocksize, 0, 0, 0);
}