diff options
| author | Richard W.M. Jones <rjones@redhat.com> | 2011-07-14 11:27:24 +0100 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2011-07-27 15:01:30 +0100 |
| commit | b6f1a5071ab8ac3e7387ffdbabd27d8c8f9b6f14 (patch) | |
| tree | 183c2b37bce05be0b499ddfeacb1d727698e6b06 | |
| parent | e55f1475d1d55cd9934d23cd7188c7e9037542f9 (diff) | |
| download | libguestfs-b6f1a5071ab8ac3e7387ffdbabd27d8c8f9b6f14.tar.gz libguestfs-b6f1a5071ab8ac3e7387ffdbabd27d8c8f9b6f14.tar.xz libguestfs-b6f1a5071ab8ac3e7387ffdbabd27d8c8f9b6f14.zip | |
mkfs: Don't die if mke2fs is not available.
Allow other types of filesystems to be created.
(cherry picked from commit c6340f45007b0ab7e1c5391cf78afc10a816553f)
| -rw-r--r-- | daemon/mkfs.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/daemon/mkfs.c b/daemon/mkfs.c index cd272686..5b38e008 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"; |