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

diff --git a/tools/virt-win-reg b/tools/virt-win-reg
index 16688f4..4c9308a 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
@@ -211,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>
@@ -244,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);
@@ -264,28 +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 __"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);
@@ -418,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); };
@@ -441,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); };