X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fmkfs.c;h=fc798c4597f510865aab028d22b7e4dc897e9d73;hp=73fd860e8ef00356e11ccbd91d84cad4d7dfb4da;hb=19005b2cfc6b077aafd16cb5b97a08180e4e39f8;hpb=a61bccecfba1c9501910d28de24bac945e95001f diff --git a/daemon/mkfs.c b/daemon/mkfs.c index 73fd860..fc798c4 100644 --- a/daemon/mkfs.c +++ b/daemon/mkfs.c @@ -1,5 +1,5 @@ /* 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 @@ -29,36 +29,162 @@ #include "daemon.h" #include "actions.h" +#define MAX_ARGS 16 + +/* Takes optional arguments, consult optargs_bitmask. */ int -do_mkfs (const char *fstype, const char *device) +do_mkfs_opts (const char *fstype, const char *device, int blocksize, + const char *features, int inode, int sectorsize) { - char *err; + 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"; - r = command (NULL, &err, "/sbin/mkfs", "-t", fstype, device, NULL); - if (r == -1) { - reply_with_error ("mkfs: %s", err); - free (err); - 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")) { + if (e2prog (mke2fs) == -1) + return -1; + argv[i++] = mke2fs; } + else + argv[i++] = "mkfs"; - free (err); - return 0; -} + argv[i++] = "-t"; + argv[i++] = fstype; -int -do_mkfs_b (const char *fstype, int blocksize, const char *device) -{ - char *err; - int r; + /* 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 (STREQ (fstype, "ntfs")) + argv[i++] = "-Q"; + + /* mkfs.reiserfs produces annoying interactive prompts unless you + * tell it to be quiet. + */ + if (STREQ (fstype, "reiserfs")) + argv[i++] = "-f"; + + /* Same for JFS. */ + if (STREQ (fstype, "jfs")) + argv[i++] = "-f"; + + /* For GFS, GFS2, assume a single node. */ + 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: */ + argv[i++] = "-j"; + argv[i++] = "1"; + /* Don't ask questions: */ + argv[i++] = "-O"; + } + + /* Process blocksize parameter if set. */ + if (optargs_bitmask & GUESTFS_MKFS_OPTS_BLOCKSIZE_BITMASK) { + if (blocksize <= 0 || !is_power_of_2 (blocksize)) { + reply_with_error ("block size must be > 0 and a power of 2"); + return -1; + } + + 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; + } - char blocksize_s[32]; - snprintf (blocksize_s, sizeof blocksize_s, "%d", blocksize); + snprintf (blocksize_str, sizeof blocksize_str, "%d", sectors_per_cluster); + argv[i++] = "-s"; + argv[i++] = blocksize_str; + } + else if (STREQ (fstype, "ntfs")) { + /* For NTFS map the blocksize into a cluster size. */ + snprintf (blocksize_str, sizeof blocksize_str, "%d", blocksize); + argv[i++] = "-c"; + argv[i++] = blocksize_str; + } + else { + /* For all other filesystem types, try the -b option. */ + snprintf (blocksize_str, sizeof blocksize_str, "%d", blocksize); + argv[i++] = "-b"; + argv[i++] = blocksize_str; + } + } + + 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; - r = command (NULL, &err, - "/sbin/mkfs", "-t", fstype, "-b", blocksize_s, device, NULL); + if (i > MAX_ARGS) + abort (); + + r = commandv (NULL, &err, argv); if (r == -1) { - reply_with_error ("mkfs_b: %s", err); + reply_with_error ("%s: %s: %s", fstype, device, err); free (err); return -1; } @@ -66,3 +192,17 @@ do_mkfs_b (const char *fstype, int blocksize, const char *device) free (err); return 0; } + +int +do_mkfs (const char *fstype, const char *device) +{ + optargs_bitmask = 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, 0); +}