[Libguestfs] [libnbd PATCH 05/20] tests: Clean up qemu-nbd detection in

[Martin Kletzander]

On Tue, Jun 08, 2021 at 10:52:35AM +0100, Richard W.M. Jones wrote:
>On Tue, Jun 08, 2021 at 09:53:46AM +0200, Martin Kletzander wrote:
>> diff --git a/copy/copy-file-to-qcow2.sh b/copy/copy-file-to-qcow2.sh
>> index 57c18b383bb7..dfd870b76413 100755
>> --- a/copy/copy-file-to-qcow2.sh
>> +++ b/copy/copy-file-to-qcow2.sh
>> @@ -21,7 +21,7 @@
>>  set -e
>>  set -x
>>
>> -requires $QEMU_NBD --version
>> +requires $QEMU_NBD --pid-file=test.pid --version
>>  requires qemu-img --version
>>  requires cmp --version
>>  requires dd --version
>
>I think I fixed this one at the same time that you did :-)  My
>fix probably conflicts on this hunk.
>

Yes.  I rebased my branch on top of yours in the meantime and fixed the
conflict.

>Rich.
>
>-- 
>Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
>Read my programming and virtualization blog: http://rwmj.wordpress.com
>virt-builder quickly builds VMs from scratch
>http://libguestfs.org/virt-builder.1.html
>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libguestfs/attachments/20210608/68b94c3e/attachment.sig>