X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=inspector%2Fvirt-inspector;h=04a0771a2294dae7f42dec04ee8cd9a3fa5b8ad5;hp=13673aff7f5150d929b5442cbb1471e4ecd6ff55;hb=a80177cc847102d5a6e43a8ff87769e86f30bd6c;hpb=ee21bc1f8071bb35409e9f15fb8309348c9a5912 diff --git a/inspector/virt-inspector b/inspector/virt-inspector index 13673af..04a0771 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: @@ -54,10 +55,6 @@ para-virtualized (PV), what applications are installed and more. Virt-inspector can produce output in several formats, including a readable text report, and XML for feeding into other programs. -Virt-inspector should only be run on I virtual machines. -The program tries to determine that the machine is inactive and will -refuse to run if it thinks you are trying to inspect a running domain. - In the normal usage, use C where C is the libvirt domain (see: C). @@ -168,13 +165,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 @@ -266,8 +261,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); @@ -305,13 +299,17 @@ if ($output eq "fish" || $output eq "ro-fish") { print "--ro "; } - print "-a $_ " foreach @images; + foreach (@images) { + printf "-a %s ", shell_quote ($_); + } 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" } @@ -323,7 +321,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); @@ -358,6 +356,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"; @@ -411,13 +410,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"; + } } } @@ -449,6 +450,7 @@ sub output_xml_os foreach ( [ "name" => "os" ], [ "distro" => "distro" ], + [ "product_name" => "product_name" ], [ "arch" => "arch" ], [ "major_version" => "major_version" ], [ "minor_version" => "minor_version" ], @@ -523,7 +525,10 @@ sub output_xml_os foreach (@apps) { $xml->startTag("application"); $xml->dataElement("name", $_->{name}); + $xml->dataElement("epoch", $_->{epoch}) if defined $_->{epoch}; $xml->dataElement("version", $_->{version}); + $xml->dataElement("release", $_->{release}); + $xml->dataElement("arch", $_->{arch}); $xml->endTag("application"); } $xml->endTag("applications"); @@ -550,23 +555,23 @@ sub output_xml_os } if ($os->{kernels}) { - $xml->startTag("kernels"); - my @kernels = @{$os->{kernels}}; - foreach (@kernels) { - $xml->startTag("kernel", - "version" => $_->{version}, - "arch" => $_->{arch}); - $xml->startTag("modules"); - my @modules = @{$_->{modules}}; - foreach (@modules) { - $xml->dataElement("module", $_); - } - $xml->endTag("modules"); - $xml->dataElement("path", $_->{path}) if(defined($_->{path})); - $xml->dataElement("package", $_->{package}) if(defined($_->{package})); - $xml->endTag("kernel"); - } - $xml->endTag("kernels"); + $xml->startTag("kernels"); + my @kernels = @{$os->{kernels}}; + foreach (@kernels) { + $xml->startTag("kernel", + "version" => $_->{version}, + "arch" => $_->{arch}); + $xml->startTag("modules"); + my @modules = @{$_->{modules}}; + foreach (@modules) { + $xml->dataElement("module", $_); + } + $xml->endTag("modules"); + $xml->dataElement("path", $_->{path}) if(defined($_->{path})); + $xml->dataElement("package", $_->{package}) if(defined($_->{package})); + $xml->endTag("kernel"); + } + $xml->endTag("kernels"); } if (exists $os->{root}->{registry}) { @@ -838,6 +843,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, @@ -847,12 +859,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