use Getopt::Long;
use Data::Dumper;
use XML::Writer;
+use String::ShellQuote qw(shell_quote);
use Locale::TextDomain 'libguestfs';
# Optional:
=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
=item B<--windows-registry>
-If this item is passed, I<and> the guest is Windows, I<and> the
-external program C<reged> 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<Win::Hivex(3)> is available, then we attempt to
+parse information out of the Registry for any Windows guest.
=back
GetOptions ("help|?" => \$help,
"version" => \$version,
"connect|c=s" => \$uri,
+ "format=s" => \$format,
"text" => sub { $output = "text" },
"none" => sub { $output = "none" },
"xml" => sub { $output = "xml" },
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 ();
# 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);
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"
}
# 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);
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";
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";
+ }
}
}
foreach ( [ "name" => "os" ],
[ "distro" => "distro" ],
+ [ "product_name" => "product_name" ],
[ "arch" => "arch" ],
[ "major_version" => "major_version" ],
[ "minor_version" => "minor_version" ],
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");
=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<sh(1)> for details.
+
=head1 SEE ALSO
L<guestfs(3)>,
L<Sys::Virt(3)>,
L<http://libguestfs.org/>.
-For Windows registry parsing we require the C<reged> program
-from L<http://home.eunet.no/~pnordahl/ntpasswd/>.
-
-=head1 AUTHOR
+=head1 AUTHORS
-Richard W.M. Jones L<http://et.redhat.com/~rjones/>
+Richard W.M. Jones L<http://people.redhat.com/~rjones/>
Matthew Booth L<mbooth@redhat.com>
git.annexia.org / libguestfs.git / blobdiff