From: Richard Jones <rjones@redhat.com>
Date: Sat, 10 Apr 2010 12:20:52 +0000 (+0100)
Subject: virt-make-fs: Use Sys::Guestfs::Lib::feature_available helper function.
X-Git-Tag: 1.3.2~11
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=e323d93ed2ab3b55885273ab6bd911e2996346d9;p=libguestfs.git

virt-make-fs: Use Sys::Guestfs::Lib::feature_available helper function.
---

diff --git a/tools/virt-make-fs b/tools/virt-make-fs
index 54c5a1d..74de4de 100755
--- a/tools/virt-make-fs
+++ b/tools/virt-make-fs
@@ -20,6 +20,7 @@ use warnings;
 use strict;
 
 use Sys::Guestfs;
+use Sys::Guestfs::Lib qw(feature_available);
 
 use Pod::Usage;
 use Getopt::Long;
@@ -407,8 +408,8 @@ eval {
     $g->add_drive ($output);
     $g->launch ();
 
-    if ($type eq "ntfs") {
-        $g->available ([ "ntfs3g" ]);
+    if ($type eq "ntfs" && !feature_available ($g, "ntfs3g", "ntfsprogs")) {
+        die __"virt-make-fs: NTFS support was disabled when libguestfs was compiled\n"
     }
 
     # Partition the disk.