test-tool: Don't use static binary helper program, nor ISO.

[libguestfs.git] / tools / virt-make-fs

diff --git a/tools/virt-make-fs b/tools/virt-make-fs
index 1a6aee4..833c8a5 100755 (executable)
--- a/tools/virt-make-fs
+++ b/tools/virt-make-fs
@@ -84,7 +84,7 @@ store something in it.
 
 Don't forget that you can also use local commands including
 L<resize2fs(8)> and L<virt-resize(1)> to resize existing filesystems,
-or rerun virt-make-resize to build another image from scratch.
+or rerun virt-make-fs to build another image from scratch.
 
 =head3 EXAMPLE
 
@@ -393,10 +393,15 @@ if (!defined $size) {
     }
 }
 
+$size = int ($size);
+
 # Create the output disk.
 # Take the unusual step of invoking qemu-img here.
 
 my @cmd = ("qemu-img", "create", "-f", $format, $output, $size);
+if ($debug) {
+    print STDERR ("running: ", join (" ", @cmd), "\n");
+}
 system (@cmd) == 0 or
     die __"qemu-img create: failed to create disk image, see earlier error messages\n";
 
@@ -405,7 +410,7 @@ 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" && !feature_available ($g, "ntfs3g", "ntfsprogs")) {
@@ -535,7 +540,7 @@ manual page L<sh(1)> for details.
 
 L<guestfish(1)>,
 L<virt-resize(1)>,
-L<virt-tar(1)>,
+L<virt-tar-in(1)>,
 L<mkisofs(1)>,
 L<genisoimage(1)>,
 L<mksquashfs(1)>,