diff options
author | Richard Jones <rjones@trick.home.annexia.org> | 2009-07-20 15:09:11 +0100 |
---|---|---|
committer | Richard Jones <rjones@trick.home.annexia.org> | 2009-07-20 15:09:11 +0100 |
commit | 7a14e0509d5cc976deda9b5299f56930e0317502 (patch) | |
tree | 9b9835140b405e4d7b27ac167cba28ffb9047d38 /perl/lib | |
parent | 06f6cc32f02c25b88e763237332b17dc7c6c6837 (diff) | |
download | libguestfs-7a14e0509d5cc976deda9b5299f56930e0317502.tar.gz libguestfs-7a14e0509d5cc976deda9b5299f56930e0317502.tar.xz libguestfs-7a14e0509d5cc976deda9b5299f56930e0317502.zip |
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.
Diffstat (limited to 'perl/lib')
-rw-r--r-- | perl/lib/Sys/Guestfs/Lib.pm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/perl/lib/Sys/Guestfs/Lib.pm b/perl/lib/Sys/Guestfs/Lib.pm index f0840901..a581def3 100644 --- a/perl/lib/Sys/Guestfs/Lib.pm +++ b/perl/lib/Sys/Guestfs/Lib.pm @@ -78,7 +78,7 @@ use vars qw(@EXPORT_OK @ISA); $g = open_guest ([$img1, $img2, ...], address => $uri, ...); - ($g, $conn, $dom) = open_guest ($name); + ($g, $conn, $dom, @images) = open_guest ($name); This function opens a libguestfs handle for either the libvirt domain called C<$name>, or the disk image called C<$name>. Any disk images @@ -108,10 +108,10 @@ passed through to C<Sys::Virt-E<gt>new> unchanged. The implicit libvirt handle is closed after this function, I<unless> you call the function in C<wantarray> context, in which case the function returns a tuple of: the open libguestfs handle, the open -libvirt handle, and the open libvirt domain handle. (This is useful -if you want to do other things like pulling the XML description of the -guest). Note that if this is a straight disk image, then C<$conn> and -C<$dom> will be C<undef>. +libvirt handle, and the open libvirt domain handle, and a list of +images. (This is useful if you want to do other things like pulling +the XML description of the guest). Note that if this is a straight +disk image, then C<$conn> and C<$dom> will be C<undef>. If the C<Sys::Virt> module is not available, then libvirt is bypassed, and this function can only open disk images. @@ -204,7 +204,7 @@ sub open_guest } } - return wantarray ? ($g, $conn, $dom) : $g + return wantarray ? ($g, $conn, $dom, @images) : $g } =head2 get_partitions |