git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add libguestfs-test-tool.
[libguestfs.git]
/
inspector
/
virt-inspector.pl
diff --git
a/inspector/virt-inspector.pl
b/inspector/virt-inspector.pl
index
3665d37
..
9148a48
100755
(executable)
--- a/
inspector/virt-inspector.pl
+++ b/
inspector/virt-inspector.pl
@@
-27,6
+27,7
@@
use Pod::Usage;
use Getopt::Long;
use Data::Dumper;
use XML::Writer;
use Getopt::Long;
use Data::Dumper;
use XML::Writer;
+use Locale::TextDomain 'libguestfs';
# Optional:
eval "use YAML::Any;";
# Optional:
eval "use YAML::Any;";
@@
-201,15
+202,20
@@
if ($version) {
print "$h{major}.$h{minor}.$h{release}$h{extra}\n";
exit
}
print "$h{major}.$h{minor}.$h{release}$h{extra}\n";
exit
}
-pod2usage (
"$0
: no image or VM names given") if @ARGV == 0;
+pod2usage (
__"virt-inspector
: no image or VM names given") if @ARGV == 0;
my $rw = 0;
$rw = 1 if $output eq "fish";
my $g;
my $rw = 0;
$rw = 1 if $output eq "fish";
my $g;
+my @images;
if ($uri) {
if ($uri) {
- $g = open_guest (\@ARGV, rw => $rw, address => $uri);
+ my ($conn, $dom);
+ ($g, $conn, $dom, @images) =
+ open_guest (\@ARGV, rw => $rw, address => $uri);
} else {
} else {
- $g = open_guest (\@ARGV, rw => $rw);
+ my ($conn, $dom);
+ ($g, $conn, $dom, @images) =
+ open_guest (\@ARGV, rw => $rw);
}
$g->launch ();
}
$g->launch ();
@@
-293,7
+299,7
@@
if ($output !~ /.*fish$/) {
if ($output eq "fish" || $output eq "ro-fish") {
my @osdevs = keys %$oses;
# This only works if there is a single OS.
if ($output eq "fish" || $output eq "ro-fish") {
my @osdevs = keys %$oses;
# This only works if there is a single OS.
- die "--fish output is only possible with a single OS\n" if @osdevs != 1;
+ die
__
"--fish output is only possible with a single OS\n" if @osdevs != 1;
my $root_dev = $osdevs[0];
my $root_dev = $osdevs[0];
@@
-301,13
+307,13
@@
if ($output eq "fish" || $output eq "ro-fish") {
print "--ro ";
}
print "--ro ";
}
- print "-a $_ " foreach @
ARGV
;
+ print "-a $_ " foreach @
images
;
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) {
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";
+ print "-m $mounts->{$_}:$_ " if $_ ne "swap"
&& $_ ne "none"
;
}
print "\n"
}
}
print "\n"
}
@@
-319,7
+325,7
@@
elsif ($output eq "perl") {
# YAML output
elsif ($output eq "yaml") {
# YAML output
elsif ($output eq "yaml") {
- die "virt-inspector: no YAML support\n"
+ die
__
"virt-inspector: no YAML support\n"
unless exists $INC{"YAML/Any.pm"};
print Dump(%$oses);
unless exists $INC{"YAML/Any.pm"};
print Dump(%$oses);
@@
-351,16
+357,18
@@
sub output_text_os
print $os->{os}, " " if exists $os->{os};
print $os->{distro}, " " if exists $os->{distro};
print $os->{os}, " " if exists $os->{os};
print $os->{distro}, " " if exists $os->{distro};
- print $os->{version}, " " if exists $os->{version};
+ print $os->{major_version} if exists $os->{major_version};
+ print ".", $os->{minor_version} if exists $os->{minor_version};
+ print " ";
print "on ", $os->{root_device}, ":\n";
print "on ", $os->{root_device}, ":\n";
- print " Mountpoints:\n";
+ print
__
" Mountpoints:\n";
my $mounts = $os->{mounts};
foreach (sort keys %$mounts) {
printf " %-30s %s\n", $mounts->{$_}, $_
}
my $mounts = $os->{mounts};
foreach (sort keys %$mounts) {
printf " %-30s %s\n", $mounts->{$_}, $_
}
- print " Filesystems:\n";
+ print
__
" Filesystems:\n";
my $filesystems = $os->{filesystems};
foreach (sort keys %$filesystems) {
print " $_:\n";
my $filesystems = $os->{filesystems};
foreach (sort keys %$filesystems) {
print " $_:\n";
@@
-378,7
+386,7
@@
sub output_text_os
my %aliases = %{$os->{modprobe_aliases}};
my @keys = sort keys %aliases;
if (@keys) {
my %aliases = %{$os->{modprobe_aliases}};
my @keys = sort keys %aliases;
if (@keys) {
- print " Modprobe aliases:\n";
+ print
__
" Modprobe aliases:\n";
foreach (@keys) {
printf " %-30s %s\n", $_, $aliases{$_}->{modulename}
}
foreach (@keys) {
printf " %-30s %s\n", $_, $aliases{$_}->{modulename}
}
@@
-389,7
+397,7
@@
sub output_text_os
my %modvers = %{$os->{initrd_modules}};
my @keys = sort keys %modvers;
if (@keys) {
my %modvers = %{$os->{initrd_modules}};
my @keys = sort keys %modvers;
if (@keys) {
- print " Initrd modules:\n";
+ print
__
" Initrd modules:\n";
foreach (@keys) {
my @modules = @{$modvers{$_}};
print " $_:\n";
foreach (@keys) {
my @modules = @{$modvers{$_}};
print " $_:\n";
@@
-398,13
+406,13
@@
sub output_text_os
}
}
}
}
- print " Applications:\n";
+ print
__
" Applications:\n";
my @apps = @{$os->{apps}};
foreach (@apps) {
print " $_->{name} $_->{version}\n"
}
my @apps = @{$os->{apps}};
foreach (@apps) {
print " $_->{name} $_->{version}\n"
}
- print " Kernels:\n";
+ print
__
" Kernels:\n";
my @kernels = @{$os->{kernels}};
foreach (@kernels) {
print " $_->{version}\n";
my @kernels = @{$os->{kernels}};
foreach (@kernels) {
print " $_->{version}\n";
@@
-415,7
+423,7
@@
sub output_text_os
}
if (exists $os->{root}->{registry}) {
}
if (exists $os->{root}->{registry}) {
- print " Windows Registry entries:\n";
+ print
__
" Windows Registry entries:\n";
# These are just lumps of text - dump them out.
foreach (@{$os->{root}->{registry}}) {
print "$_\n";
# These are just lumps of text - dump them out.
foreach (@{$os->{root}->{registry}}) {
print "$_\n";
@@
-442,7
+450,10
@@
sub output_xml_os
foreach ( [ "name" => "os" ],
[ "distro" => "distro" ],
foreach ( [ "name" => "os" ],
[ "distro" => "distro" ],
- [ "version" => "version" ],
+ [ "major_version" => "major_version" ],
+ [ "minor_version" => "minor_version" ],
+ [ "package_format" => "package_format" ],
+ [ "package_management" => "package_management" ],
[ "root" => "root_device" ] ) {
$xml->dataElement($_->[0], $os->{$_->[1]}) if exists $os->{$_->[1]};
}
[ "root" => "root_device" ] ) {
$xml->dataElement($_->[0], $os->{$_->[1]}) if exists $os->{$_->[1]};
}
@@
-622,7
+633,8
@@
sub output_query_rhel
{
my $rhel = "no";
foreach my $os (keys %$oses) {
{
my $rhel = "no";
foreach my $os (keys %$oses) {
- $rhel="yes" if $oses->{$os}->{os} eq "linux" && $oses->{$os}->{distro} eq "redhat";
+ $rhel="yes" if ($oses->{$os}->{os} eq "linux" &&
+ $oses->{$os}->{distro} eq "rhel");
}
print "rhel=$rhel\n";
}
}
print "rhel=$rhel\n";
}
@@
-769,6
+781,8
@@
from L<http://home.eunet.no/~pnordahl/ntpasswd/>.
Richard W.M. Jones L<http://et.redhat.com/~rjones/>
Richard W.M. Jones L<http://et.redhat.com/~rjones/>
+Matthew Booth L<mbooth@redhat.com>
+
=head1 COPYRIGHT
Copyright (C) 2009 Red Hat Inc.
=head1 COPYRIGHT
Copyright (C) 2009 Red Hat Inc.