X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=tools%2Fvirt-edit;h=887ef4b64609dad086b13e9e6834a26f4290c459;hp=154d3363916ec156110375a1881429bf51398d91;hb=fb998000e60b32219c2bf839044cff59f499dff1;hpb=fed8714b92b57da1a593f74b52635fd267442d5b

diff --git a/tools/virt-edit b/tools/virt-edit
index 154d336..887ef4b 100755
--- a/tools/virt-edit
+++ b/tools/virt-edit
@@ -120,6 +120,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 $expr;
 
 =item B<--expr EXPR> | B<-e EXPR>
@@ -138,6 +155,7 @@ being altered by the shell.
 GetOptions ("help|?" => \$help,
             "version" => \$version,
             "connect|c=s" => \$uri,
+            "format=s" => \$format,
             "expr|e=s" => \$expr,
             "backup|b=s" => \$backup,
     ) or pod2usage (2);
@@ -156,9 +174,9 @@ my $filename = pop @ARGV;
 
 my $g;
 if ($uri) {
-    $g = open_guest (\@ARGV, address => $uri, rw => 1);
+    $g = open_guest (\@ARGV, address => $uri, rw => 1, format => $format);
 } else {
-    $g = open_guest (\@ARGV, rw => 1);
+    $g = open_guest (\@ARGV, rw => 1, format => $format);
 }
 
 $g->launch ();
@@ -180,7 +198,7 @@ my $root_dev = $roots[0];
 my $os = $oses->{$root_dev};
 mount_operating_system ($g, $os, 0);
 
-my ($fh_not_used, $tempname) = tempfile ();
+my ($fh_not_used, $tempname) = tempfile (UNLINK => 1);
 
 # Allow this to fail in case eg. the file does not exist.
 $g->download($filename, $tempname);
@@ -203,7 +221,7 @@ if (!defined $expr) {
         print __"File not changed.\n";
     }
 } else {
-    my ($fh, $tempout) = tempfile ();
+    my ($fh, $tempout) = tempfile (UNLINK => 1);
 
     # Apply a Perl expression to the lines of the file.
     open IFILE, $tempname or die "$tempname: $!";
@@ -322,6 +340,13 @@ If not set, C<vi> is used.
 
 =back
 
+=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)>,