X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=tools%2Fvirt-win-reg;h=ed298fbc6b393d268fb4d0fb905bf37bd33acf4d;hb=99dc2a9702e6c8a2bf9073af4cbf1803417ec3ee;hp=74881b67826a46cc8fe0973454cf76f43e8ff75f;hpb=feb0cd04822231f056c3086f322afbefc2e2467c;p=libguestfs.git

diff --git a/tools/virt-win-reg b/tools/virt-win-reg
index 74881b6..ed298fb 100755
--- a/tools/virt-win-reg
+++ b/tools/virt-win-reg
@@ -211,6 +211,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 $merge;
 
 =item B<--merge>
@@ -244,6 +261,7 @@ GetOptions ("help|?" => \$help,
             "version" => \$version,
             "connect|c=s" => \$uri,
             "debug|d" => \$debug,
+            "format=s" => \$format,
             "merge" => \$merge,
             "encoding=s" => \$encoding,
     ) or pod2usage (2);
@@ -264,6 +282,7 @@ warn "launching libguestfs ..." if $debug;
 my @lib_args = ([$domname_or_image]);
 push @lib_args, address => $uri if $uri;
 push @lib_args, rw => 1 if $merge;
+push @lib_args, format => $format if defined $format;
 my $g = open_guest (@lib_args);
 $g->launch ();
 
@@ -280,7 +299,6 @@ my %fses =
 my $oses = inspect_operating_systems ($g, \%fses);
 
 my @roots = keys %$oses;
-die __"no root device found in this operating system image" if @roots == 0;
 die __"multiboot operating systems are not supported by virt-win-reg" if @roots > 1;
 my $root_dev = $roots[0];
 
@@ -459,6 +477,13 @@ sub upload_hive
     }
 }
 
+=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<hivex(3)>,