From b6f1a5071ab8ac3e7387ffdbabd27d8c8f9b6f14 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 14 Jul 2011 11:27:24 +0100 Subject: [PATCH] mkfs: Don't die if mke2fs is not available. Allow other types of filesystems to be created. (cherry picked from commit c6340f45007b0ab7e1c5391cf78afc10a816553f) --- daemon/mkfs.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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"; -- 1.8.3.1