tools: Use C API for inspection (RHBZ#642930).

[libguestfs.git] / tools / virt-tar

diff --git a/tools/virt-tar b/tools/virt-tar
index 3e6e20b..af9f817 100755 (executable)
--- a/tools/virt-tar
+++ b/tools/virt-tar
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 # virt-tar
 #!/usr/bin/perl -w
 # virt-tar

-# Copyright (C) 2009 Red Hat Inc.
+# Copyright (C) 2009-2010 Red Hat Inc.

 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by


@@ -20,11 +20,10 @@ use warnings;
 use strict;
 
 use Sys::Guestfs;
 use strict;
 
 use Sys::Guestfs;

-use Sys::Guestfs::Lib qw(open_guest get_partitions resolve_windows_path
-  inspect_all_partitions inspect_partition
-  inspect_operating_systems mount_operating_system);
+use Sys::Guestfs::Lib qw(open_guest);

 use Pod::Usage;
 use Getopt::Long;
 use Pod::Usage;
 use Getopt::Long;

+use File::Basename;

 use Locale::TextDomain 'libguestfs';
 
 =encoding utf8
 use Locale::TextDomain 'libguestfs';
 
 =encoding utf8


@@ -130,6 +129,23 @@ at all.
 
 =cut
 
 
 =cut
 

+my $format;
+
+=item B<--format> raw
+
+Specify the format of disk images given on the command line.  If this
+is omitted then the format is autodetected from the content of the
+disk image.
+
+If disk images are requested from libvirt, then this program asks
+libvirt for this information.  In this case, the value of the format
+parameter is ignored.
+
+If working with untrusted raw-format guest disk images, you should
+ensure the format is always specified.
+
+=cut
+

 my $mode;
 
 =item B<-x> | B<--extract> | B<--download>
 my $mode;
 
 =item B<-x> | B<--extract> | B<--download>


@@ -175,6 +191,7 @@ Getopt::Long::Configure ("bundling");
 GetOptions ("help|?" => \$help,
             "version" => \$version,
             "connect|c=s" => \$uri,
 GetOptions ("help|?" => \$help,
             "version" => \$version,
             "connect|c=s" => \$uri,

+            "format=s" => \$format,

             "extract|download|x" => \&set_mode_x,
             "upload|u" => \&set_mode_u,
             "gzip|z" => \$gzip,
             "extract|download|x" => \&set_mode_x,
             "upload|u" => \&set_mode_u,
             "gzip|z" => \$gzip,


@@ -211,26 +228,26 @@ die __x("virt-tar: {dir}: directory name must start with '/' character\n",
 my @args = (\@ARGV);
 push @args, address => $uri if $uri;
 push @args, rw => 1 if $mode eq "u";
 my @args = (\@ARGV);
 push @args, address => $uri if $uri;
 push @args, rw => 1 if $mode eq "u";

+push @args, format => $format if defined $format;

 
 my $g = open_guest (@args);
 $g->launch ();
 
 
 my $g = open_guest (@args);
 $g->launch ();
 

-# List of possible filesystems.
-my @partitions = get_partitions ($g);
-
-# Now query each one to build up a picture of what's in it.
-my %fses =
-    inspect_all_partitions ($g, \@partitions,
-      use_windows_registry => 0);
-
-my $oses = inspect_operating_systems ($g, \%fses);
-
-my @roots = keys %$oses;
-die __"multiboot operating systems are not supported by virt-tar\n" if @roots > 1;
-my $root_dev = $roots[0];
-
-my $os = $oses->{$root_dev};
-mount_operating_system ($g, $os, $mode eq "u" ? 0 : 1);
+my @roots = $g->inspect_os ();
+if (@roots == 0) {
+    die __x("{prog}: No operating system could be detected inside this disk image.\n\nThis may be because the file is not a disk image, or is not a virtual machine\nimage, or because the OS type is not understood by libguestfs.\n\nIf you feel this is an error, please file a bug report including as much\ninformation about the disk image as possible.\n",
+            prog => basename ($0));
+}
+if (@roots > 1) {
+    die __x("{prog}: multiboot operating systems are not supported.\n",
+            prog => basename ($0))
+}
+my %fses = $g->inspect_get_mountpoints ($roots[0]);
+my @fses = sort { length $a <=> length $b } keys %fses;
+my $mountopts = $mode eq "u" ? "" : "ro";
+foreach (@fses) {
+    $g->mount_options ($mountopts, $fses{$_}, $_);
+}

 
 # Do the tar command.
 if ($mode eq "x") {
 
 # Do the tar command.
 if ($mode eq "x") {


@@ -254,6 +271,13 @@ undef $g;
 
 exit 0;
 
 
 exit 0;
 

+=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<guestfs(3)>,
 =head1 SEE ALSO
 
 L<guestfs(3)>,