X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fmkfs.c;h=8bb7341f8ba64a90cc9793c4c9a9e6301aee51b0;hb=e494a59921456d854a070612dad3e7c1e83f30a1;hp=fa03afe88a83d7a6b403a1033108f890d857cf8e;hpb=97245561cf6a7f0b6c5d2eac8c2bdf1618d466ec;p=libguestfs.git diff --git a/daemon/mkfs.c b/daemon/mkfs.c index fa03afe..8bb7341 100644 --- a/daemon/mkfs.c +++ b/daemon/mkfs.c @@ -40,18 +40,18 @@ do_mkfs_opts (const char *fstype, const char *device, int blocksize) char blocksize_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";