X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=inspector%2Fvirt-inspector;h=36fbfa90847ce69fca415db4552268a3eaa4ec89;hb=a51f56adb168ac7d4b65b98c7f0cdb07f266265f;hp=cb892c06f43847d833e1d14ebe586ecfc81f9f62;hpb=a59dcdbd1b0a28c960e3792165a13f2daf4f6c35;p=libguestfs.git diff --git a/inspector/virt-inspector b/inspector/virt-inspector index cb892c0..36fbfa9 100755 --- a/inspector/virt-inspector +++ b/inspector/virt-inspector @@ -27,6 +27,7 @@ use Pod::Usage; use Getopt::Long; use Data::Dumper; use XML::Writer; +use String::ShellQuote qw(shell_quote); use Locale::TextDomain 'libguestfs'; # Optional: @@ -106,6 +107,23 @@ then libvirt is not used 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 $output = "text"; =back @@ -164,13 +182,11 @@ my $windows_registry; =item B<--windows-registry> -If this item is passed, I the guest is Windows, I the -external program C is available (see SEE ALSO section), then we -attempt to parse the Windows registry. This allows much more -information to be gathered for Windows guests. +This flag is ignored for compatibility with earlier releases of the +software. -This is quite an expensive and slow operation, so we don't do it by -default. +In this version, if L is available, then we attempt to +parse information out of the Registry for any Windows guest. =back @@ -179,6 +195,7 @@ default. GetOptions ("help|?" => \$help, "version" => \$version, "connect|c=s" => \$uri, + "format=s" => \$format, "text" => sub { $output = "text" }, "none" => sub { $output = "none" }, "xml" => sub { $output = "xml" }, @@ -201,17 +218,25 @@ if ($version) { pod2usage (__"virt-inspector: no image or VM names given") if @ARGV == 0; my $rw = 0; + +# XXX This is a bug: Originally we intended to open the guest with +# rw=>1 in order to tell Sys::Guestfs::Lib that we should disallow +# active domains. However this also has the effect of opening the +# disk image in write mode, and in any case we don't use this option +# in guestfish any more since we moved all the inspection code into +# the core library. We should drop the fish output modes completely. $rw = 1 if $output eq "fish"; + my $g; my @images; if ($uri) { my ($conn, $dom); ($g, $conn, $dom, @images) = - open_guest (\@ARGV, rw => $rw, address => $uri); + open_guest (\@ARGV, rw => $rw, address => $uri, format => $format); } else { my ($conn, $dom); ($g, $conn, $dom, @images) = - open_guest (\@ARGV, rw => $rw); + open_guest (\@ARGV, rw => $rw, format => $format); } $g->launch (); @@ -262,8 +287,7 @@ 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 => $windows_registry); + inspect_all_partitions ($g, \@partitions); #print "fses -----------\n"; #print Dumper(\%fses); @@ -301,13 +325,22 @@ if ($output eq "fish" || $output eq "ro-fish") { print "--ro "; } - print "-a $_ " foreach @images; + foreach (@images) { + unless (defined $_->[1]) { + printf "-a %s ", shell_quote ($_->[0]); + } else { + printf "--format %s -a %s ", + shell_quote ($_->[1]), shell_quote ($_->[0]); + } + } my $mounts = $oses->{$root_dev}->{mounts}; # Have to mount / first. Luckily '/' is early in the ASCII # character set, so this should be OK. foreach (sort keys %$mounts) { - print "-m $mounts->{$_}:$_ " if $_ ne "swap" && $_ ne "none"; + if ($_ ne "swap" && $_ ne "none") { + printf "-m %s ", shell_quote ("$mounts->{$_}:$_"); + } } print "\n" } @@ -319,7 +352,7 @@ elsif ($output eq "perl") { # YAML output elsif ($output eq "yaml") { - die __"virt-inspector: no YAML support\n" + die __"virt-inspector: no YAML support, try installing perl-YAML or libyaml-perl\n" unless exists $INC{"YAML/Any.pm"}; print Dump(%$oses); @@ -354,6 +387,7 @@ sub output_text_os print $os->{arch}, " " if exists $os->{arch}; print $os->{major_version} if exists $os->{major_version}; print ".", $os->{minor_version} if exists $os->{minor_version}; + print " (", $os->{product_name}, ")" if exists $os->{product_name}; print " "; print "on ", $os->{root_device}, ":\n"; @@ -407,13 +441,15 @@ sub output_text_os print " $_->{name} $_->{version}\n" } - print __" Kernels:\n"; - my @kernels = @{$os->{kernels}}; - foreach (@kernels) { - print " $_->{version} ($_->{arch})\n"; - my @modules = @{$_->{modules}}; - foreach (@modules) { - print " $_\n"; + if ($os->{kernels}) { + print __" Kernels:\n"; + my @kernels = @{$os->{kernels}}; + foreach (@kernels) { + print " $_->{version} ($_->{arch})\n"; + my @modules = @{$_->{modules}}; + foreach (@modules) { + print " $_\n"; + } } } @@ -445,6 +481,7 @@ sub output_xml_os foreach ( [ "name" => "os" ], [ "distro" => "distro" ], + [ "product_name" => "product_name" ], [ "arch" => "arch" ], [ "major_version" => "major_version" ], [ "minor_version" => "minor_version" ], @@ -837,6 +874,13 @@ sub output_query_kernel_arch =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 for details. + =head1 SEE ALSO L, @@ -846,12 +890,9 @@ L, L, L. -For Windows registry parsing we require the C program -from L. - -=head1 AUTHOR +=head1 AUTHORS -Richard W.M. Jones L +Richard W.M. Jones L Matthew Booth L