X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=tools%2Fvirt-make-fs;h=4e928af440a0d58b9318ab34b0df39d2d1412bd2;hp=54c5a1dc68da46b1d91f5af87faf73e01f5bf0aa;hb=bf0280bf589573c11529999a73e9ec642dea9d61;hpb=d868221d9f746ab17b83e7220cef9227fcad3696

diff --git a/tools/virt-make-fs b/tools/virt-make-fs
index 54c5a1d..4e928af 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;
@@ -404,11 +405,11 @@ eval {
 
     # Run libguestfs.
     my $g = Sys::Guestfs->new ();
-    $g->add_drive ($output);
+    $g->add_drive_opts ($output, format => $format);
     $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.
@@ -523,6 +524,13 @@ sub create_pipe
     return $pipe;
 }
 
+=head1 SHELL QUOTING
+
+Libvirt guest names can contain arbitrary characters, some of which
+have meaning to the shell such as C<#> and space.  You may need to
+quote or escape these characters on the command line.  See the shell
+manual page L<sh(1)> for details.
+
 =head1 SEE ALSO
 
 L<guestfish(1)>,
@@ -550,7 +558,7 @@ L<https://bugzilla.redhat.com/>
 
 =head1 AUTHOR
 
-Richard W.M. Jones L<http://et.redhat.com/~rjones/>
+Richard W.M. Jones L<http://people.redhat.com/~rjones/>
 
 =head1 COPYRIGHT