X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=inspector%2Fvirt-inspector.pl;h=cd5427a546210c3604c998817980080db88d9365;hb=9449b0fce4145a56df9d43169d61e8b2c4e41b09;hp=7ab808b8c6d163bdf8bcfa402a29e62405180dee;hpb=22528e9bc486cbb6357192bd758c417c61bba955;p=libguestfs.git

diff --git a/inspector/virt-inspector.pl b/inspector/virt-inspector.pl
index 7ab808b..cd5427a 100755
--- a/inspector/virt-inspector.pl
+++ b/inspector/virt-inspector.pl
@@ -26,7 +26,6 @@ use Sys::Guestfs::Lib qw(open_guest get_partitions resolve_windows_path
 use Pod::Usage;
 use Getopt::Long;
 use Data::Dumper;
-use File::Temp qw/tempdir/;
 use XML::Writer;
 
 # Optional:
@@ -89,6 +88,14 @@ Display brief help.
 
 =cut
 
+my $version;
+
+=item B<--version>
+
+Display version number and exit.
+
+=cut
+
 my $uri;
 
 =item B<--connect URI> | B<-c URI>
@@ -102,18 +109,6 @@ then libvirt is not used at all.
 
 =cut
 
-my $force;
-
-=item B<--force>
-
-Force reading a particular guest even if it appears to be active.  In
-earlier versions of virt-inspector, this could be dangerous (for
-example, corrupting the guest's disk image).  However in more recent
-versions, it should not cause corruption, but might cause
-virt-inspector to crash or produce incorrect results.
-
-=cut
-
 my $output = "text";
 
 =back
@@ -185,8 +180,8 @@ default.
 =cut
 
 GetOptions ("help|?" => \$help,
+	    "version" => \$version,
 	    "connect|c=s" => \$uri,
-	    "force" => \$force,
 	    "text" => sub { $output = "text" },
 	    "none" => sub { $output = "none" },
 	    "xml" => sub { $output = "xml" },
@@ -200,6 +195,12 @@ GetOptions ("help|?" => \$help,
 	    "windows-registry" => \$windows_registry,
     ) or pod2usage (2);
 pod2usage (1) if $help;
+if ($version) {
+    my $g = Sys::Guestfs->new ();
+    my %h = $g->version ();
+    print "$h{major}.$h{minor}.$h{release}$h{extra}\n";
+    exit
+}
 pod2usage ("$0: no image or VM names given") if @ARGV == 0;
 
 my $rw = 0;
@@ -306,7 +307,7 @@ if ($output eq "fish" || $output eq "ro-fish") {
     # 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"
 }
@@ -768,6 +769,8 @@ from L<http://home.eunet.no/~pnordahl/ntpasswd/>.
 
 Richard W.M. Jones L<http://et.redhat.com/~rjones/>
 
+Matthew Booth L<mbooth@redhat.com>
+
 =head1 COPYRIGHT
 
 Copyright (C) 2009 Red Hat Inc.