X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=tools%2Fvirt-win-reg;h=16688f4717e5d70609af1470e45735c9002d7270;hp=b4bb1f0f6625419f0b2ffd85b13fce003dc67255;hb=4d88a74532b20bcb60909c0d0983cdf7498aa08c;hpb=4b48f93ce6407923ea23451cfe39ac63811d1f42

diff --git a/tools/virt-win-reg b/tools/virt-win-reg
index b4bb1f0..16688f4 100755
--- a/tools/virt-win-reg
+++ b/tools/virt-win-reg
@@ -151,8 +151,23 @@ Paths and value names are case-insensitive.
 
 Registry keys like C<CurrentControlSet> don't really exist in the
 Windows Registry at the level of the hive file, and therefore you
-cannot modify these.  Replace this with C<ControlSet001>, and
-similarly for other C<Current...> keys.
+cannot modify these.
+
+C<CurrentControlSet> is usually an alias for C<ControlSet001>.  In
+some circumstances it might refer to another control set.  The way
+to find out is to look at the C<HKLM\SYSTEM\Select> key:
+
+ # virt-win-reg WindowsGuest 'HKLM\SYSTEM\Select'
+ [HKEY_LOCAL_MACHINE\SYSTEM\Select]
+ "Current"=dword:00000001
+ "Default"=dword:00000001
+ "Failed"=dword:00000000
+ "LastKnownGood"=dword:00000002
+
+"Default" is the one which Windows will choose when it boots.
+
+Similarly, other C<Current...> keys in the path may need to
+be replaced.
 
 =head1 OPTIONS
 
@@ -265,7 +280,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];
 
@@ -323,7 +337,7 @@ else {                          # Import mode.
     %hives = ();
 
     # Look in the tmpdir for all the hive files which have been
-    # downloaded / modified by the import mapper, and upload
+    # downloaded / modified by the import mapper, and upload
     # each one.
     opendir my $dh, $tmpdir or die "$tmpdir: $!";
     foreach (readdir $dh) {
@@ -444,6 +458,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)>,
@@ -472,7 +493,7 @@ L<https://bugzilla.redhat.com/>
 
 =head1 AUTHOR
 
-Richard W.M. Jones L<http://et.redhat.com/~rjones/>
+Richard W.M. Jones L<http://people.redhat.com/~rjones/>
 
 =head1 COPYRIGHT