virt-inspector --fish: Fix incorrect '-a' parameter (RHBZ#512709)

virt-inspector --fish dom
virt-inspector --ro-fish dom

Both of the above commands give incorrect results if run on a
libvirt domain, eg:

$ virt-inspector --ro-fish RHEL54Betax64
==> --ro -a RHEL54Betax64 -m /dev/VolGroup00/LogVol00:/ -m /dev/sda1:/boot
            ^^^^^^^^^^^^^

This is because the current code just prints back the original @ARGV
parameters.

This patch fixes this by getting the image names instead.

1 files changed, 8 insertions, 3 deletions

diff --git a/inspector/virt-inspector.pl b/inspector/virt-inspector.pl
index cd53bcbf..09edbae1 100755
--- a/inspector/virt-inspector.pl
+++ b/inspector/virt-inspector.pl
@@ -207,10 +207,15 @@ pod2usage (__"virt-inspector: no image or VM names given") if @ARGV == 0;
 my $rw = 0;
 $rw = 1 if $output eq "fish";
 my $g;
+my @images;
 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 {
-    $g = open_guest (\@ARGV, rw => $rw);
+    my ($conn, $dom);
+    ($g, $conn, $dom, @images) =
+	open_guest (\@ARGV, rw => $rw);
 }
 
 $g->launch ();
@@ -302,7 +307,7 @@ if ($output eq "fish" || $output eq "ro-fish") {
 	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