[Libguestfs] [PATCH 3/6] Use add_drive instead of add_cdrom for transfer iso image

[Matthew Booth]

On 09/02/10 16:03, Richard W.M. Jones wrote:
> 
> On Tue, Feb 09, 2010 at 04:01:16PM +0000, Matthew Booth wrote:
>> There's a current bug in libguestfs which means the order of devices returned by
>> list-devices is unpredictable if there are a mix of drive types. Presenting the
>> transfer iso as a hard disk rather than a cdrom drive works fine, and works
>> around this issue.
>> ---
>>  v2v/virt-v2v.pl |    5 ++---
>>  1 files changed, 2 insertions(+), 3 deletions(-)
>>
>> diff --git a/v2v/virt-v2v.pl b/v2v/virt-v2v.pl
>> index ee2210f..cf78523 100755
>> --- a/v2v/virt-v2v.pl
>> +++ b/v2v/virt-v2v.pl
>> @@ -350,9 +350,8 @@ sub get_guestfs_handle
>>  {
>>      my $g = open_guest(\@_, rw => 1);
>>  
>> -    # Mount the transfer iso if GuestOS needs it
>> -    my $transferiso = Sys::VirtV2V::GuestOS->get_transfer_iso();
>> -    $g->add_cdrom($transferiso) if(defined($transferiso));
>> +    # Add the transfer iso if there is one
>> +    $g->add_drive($transferiso) if(defined($transferiso));
>>  
>>      # Enable selinux in the guest
>>      $g->set_selinux(1);
> 
> ACK.  I think you should file a bug against libguestfs about
> the original issue too.

Thanks, pushed. Filed a BZ, and updated the commit message to reference it.

Matt
-- 
Matthew Booth, RHCA, RHCSS
Red Hat Engineering, Virtualisation Team

M:       +44 (0)7977 267231
GPG ID:  D33C3490
GPG FPR: 3733 612D 2D05 5458 8A8A 1600 3441 EA19 D33C 3490