git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fish: Create a separate FILES section in the manpage.
[libguestfs.git]
/
inspector
/
virt-inspector
diff --git
a/inspector/virt-inspector
b/inspector/virt-inspector
index
cb892c0
..
f62d21f
100755
(executable)
--- 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 Getopt::Long;
use Data::Dumper;
use XML::Writer;
+use String::ShellQuote qw(shell_quote);
use Locale::TextDomain 'libguestfs';
# Optional:
use Locale::TextDomain 'libguestfs';
# Optional:
@@
-164,13
+165,11
@@
my $windows_registry;
=item B<--windows-registry>
=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
-
defaul
t.
+In this version, if L<Win::Hivex(3)> is available, then we attempt to
+
parse information out of the Registry for any Windows gues
t.
=back
=back
@@
-262,8
+261,7
@@
my @partitions = get_partitions ($g);
# Now query each one to build up a picture of what's in it.
my %fses =
# 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 "fses -----------\n";
#print Dumper(\%fses);
@@
-301,13
+299,17
@@
if ($output eq "fish" || $output eq "ro-fish") {
print "--ro ";
}
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) {
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"
}
}
print "\n"
}
@@
-354,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->{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 " ";
print "on ", $os->{root_device}, ":\n";
@@
-407,13
+410,15
@@
sub output_text_os
print " $_->{name} $_->{version}\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";
+ }
}
}
}
}
@@
-445,6
+450,7
@@
sub output_xml_os
foreach ( [ "name" => "os" ],
[ "distro" => "distro" ],
foreach ( [ "name" => "os" ],
[ "distro" => "distro" ],
+ [ "product_name" => "product_name" ],
[ "arch" => "arch" ],
[ "major_version" => "major_version" ],
[ "minor_version" => "minor_version" ],
[ "arch" => "arch" ],
[ "major_version" => "major_version" ],
[ "minor_version" => "minor_version" ],
@@
-846,12
+852,9
@@
L<Sys::Guestfs::Lib(3)>,
L<Sys::Virt(3)>,
L<http://libguestfs.org/>.
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>
Matthew Booth L<mbooth@redhat.com>