Fix networking in the appliance.

[libguestfs.git] / tools / virt-tar

diff --git a/tools/virt-tar b/tools/virt-tar
index 612b500..ea33fcf 100755 (executable)
--- a/tools/virt-tar
+++ b/tools/virt-tar
@@ -25,7 +25,6 @@ use Sys::Guestfs::Lib qw(open_guest get_partitions resolve_windows_path
   inspect_operating_systems mount_operating_system);
 use Pod::Usage;
 use Getopt::Long;
-use File::Temp qw/tempfile/;
 use Locale::TextDomain 'libguestfs';
 
 =encoding utf8
@@ -131,6 +130,23 @@ at all.
 
 =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>
@@ -176,6 +192,7 @@ Getopt::Long::Configure ("bundling");
 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,
@@ -202,14 +219,17 @@ if ($mode eq "x") {
 } else { # $mode eq "u"
     $directory = pop @ARGV;
     $tarball = pop @ARGV;
-    die __"virt-tar: $tarball: file not found\n" unless -f $tarball;
+    die __x("virt-tar: {tarball}: file not found\n",
+            tarball => $tarball) unless -f $tarball;
 }
-die __"virt-tar: $directory: directory name must start with '/' character\n"
+die __x("virt-tar: {dir}: directory name must start with '/' character\n",
+        dir => $directory)
     unless substr ($directory, 0, 1) eq "/";
 
 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 ();
@@ -225,7 +245,6 @@ my %fses =
 my $oses = inspect_operating_systems ($g, \%fses);
 
 my @roots = keys %$oses;
-die __"no root device found in this operating system image\n" if @roots == 0;
 die __"multiboot operating systems are not supported by virt-tar\n" if @roots > 1;
 my $root_dev = $roots[0];
 
@@ -254,6 +273,13 @@ undef $g;
 
 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)>,