X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fmkfs.c;h=5b38e008c5f26cc89d9184449032667d063dba82;hb=dc186082b12416e7f53ca7542e7363842cc779ff;hp=cd2726867fc92d5ea208d87a5f0240c10dbdd517;hpb=a0e3b2183733c7440ad017c4ffe361935672339b;p=libguestfs.git diff --git a/daemon/mkfs.c b/daemon/mkfs.c index cd27268..5b38e00 100644 --- a/daemon/mkfs.c +++ b/daemon/mkfs.c @@ -40,18 +40,18 @@ do_mkfs_opts (const char *fstype, const char *device, int blocksize, const char 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";