X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=inspector%2Fvirt-inspector.pl;h=6d3c472fa62218f936493aaba7a1bdbf2c916bd9;hb=96b9d82e2f4f24cdd41040f54a7597202c04cf7e;hp=76c9096764b3c28138a7dbfd5bb03772aa97d22b;hpb=135d55fe24bce65f8eb8ca50193eda8287fe7c9a;p=libguestfs.git

diff --git a/inspector/virt-inspector.pl b/inspector/virt-inspector.pl
index 76c9096..6d3c472 100755
--- a/inspector/virt-inspector.pl
+++ b/inspector/virt-inspector.pl
@@ -213,7 +213,7 @@ if (-e $ARGV[0]) {
 
 # We've now got the list of @images, so feed them to libguestfs.
 my $g = Sys::Guestfs->new ();
-$g->add_drive ($_) foreach @images;
+$g->add_drive_ro ($_) foreach @images;
 $g->launch ();
 $g->wait_ready ();
 
@@ -627,13 +627,15 @@ sub check_for_kernels
 		my %kernel;
 		$kernel{version} = $_;
 
+		# List modules.
+		my @modules;
+		foreach ($g->find ("/lib/modules/$_")) {
+		    if (m,/([^/]+)\.ko,) {
+			push @modules, $1;
+		    }
+		}
 
-		# XXX List modules.
-
-
-
-
-
+		$kernel{modules} = \@modules;
 
 		push @kernels, \%kernel;
 	    }
@@ -730,10 +732,11 @@ sub output_text_os
     print "  Kernels:\n";
     my @kernels = @{$os->{kernels}};
     foreach (@kernels) {
-	print "    $_->{version}\n"
-
-
-
+	print "    $_->{version}\n";
+	my @modules = @{$_->{modules}};
+	foreach (@modules) {
+	    print "      $_\n";
+	}
     }
 }
 
@@ -793,12 +796,12 @@ sub output_xml_os
     foreach (@kernels) {
 	print "<kernel>\n";
 	print "<version>$_->{version}</version>\n";
-
-
-
-
-
-
+	print "<modules>\n";
+	my @modules = @{$_->{modules}};
+	foreach (@modules) {
+	    print "<module>$_</module>\n";
+	}
+	print "</modules>\n";
 	print "</kernel>\n";
     }
     print "</kernels>\n";