X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=tools%2Fvirt-win-reg;h=19fff9d4a73b0fbdfbf2f89757e9d502f63e9ab9;hp=b4bb1f0f6625419f0b2ffd85b13fce003dc67255;hb=6d4815d3a4921219379bc9ec3cceead217668426;hpb=4b48f93ce6407923ea23451cfe39ac63811d1f42 diff --git a/tools/virt-win-reg b/tools/virt-win-reg index b4bb1f0..19fff9d 100755 --- a/tools/virt-win-reg +++ b/tools/virt-win-reg @@ -20,15 +20,14 @@ use warnings; 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 Win::Hivex; use Win::Hivex::Regedit qw(reg_import reg_export); use Pod::Usage; use Getopt::Long; use File::Temp qw/tempdir/; +use File::Basename; use Locale::TextDomain 'libguestfs'; =encoding utf8 @@ -151,8 +150,23 @@ Paths and value names are case-insensitive. Registry keys like C 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, and -similarly for other C keys. +cannot modify these. + +C is usually an alias for C. In +some circumstances it might refer to another control set. The way +to find out is to look at the C 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 + +"Current" is the one which Windows will choose when it boots. + +Similarly, other C keys in the path may need to +be replaced. =head1 OPTIONS @@ -196,6 +210,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> @@ -229,6 +260,7 @@ GetOptions ("help|?" => \$help, "version" => \$version, "connect|c=s" => \$uri, "debug|d" => \$debug, + "format=s" => \$format, "merge" => \$merge, "encoding=s" => \$encoding, ) or pod2usage (2); @@ -249,29 +281,29 @@ 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 (); warn "inspecting guest ..." if $debug; -# 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 __"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]; +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 = $merge ? "" : "ro"; +foreach (@fses) { + $g->mount_options ($mountopts, $fses{$_}, $_); +} -my $os = $oses->{$root_dev}; -my $ro = $merge ? 0 : 1; -mount_operating_system ($g, $os, $ro); +my $systemroot = $g->inspect_get_windows_systemroot ($roots[0]); # Create a working directory to store the downloaded registry files. my $tmpdir = tempdir (CLEANUP => 1); @@ -323,7 +355,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) { @@ -404,7 +436,6 @@ sub download_hive local $_; my $hivename = shift; - my $systemroot = $os->{root}->{systemroot} || "/windows"; my $winfile_before = "$systemroot/system32/config/$hivename"; my $winfile; eval { $winfile = $g->case_sensitive_path ($winfile_before); }; @@ -427,7 +458,6 @@ sub upload_hive local $_; my $hivename = shift; - my $systemroot = $os->{root}->{systemroot} || "/windows"; my $winfile_before = "$systemroot/system32/config/$hivename"; my $winfile; eval { $winfile = $g->case_sensitive_path ($winfile_before); }; @@ -444,6 +474,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 for details. + =head1 SEE ALSO L, @@ -472,7 +509,7 @@ L =head1 AUTHOR -Richard W.M. Jones L +Richard W.M. Jones L =head1 COPYRIGHT