From: Josh Durgin <jdurgin@redhat.com>
Date: Mon, 2 Feb 2015 15:43:35 +0000 (+0100)
Subject: qa: use correct binary path on rpm-based systems
X-Git-Tag: v0.87.1~2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=ccb0914f76da23acdd7374233cd1939ab80ef3c8;p=ceph.git

qa: use correct binary path on rpm-based systems

Fixes: #10715
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
(cherry picked from commit 05ce2aa1bf030ea225300b48e7914577a412b38c)
---

diff --git a/qa/workunits/rbd/qemu-iotests.sh b/qa/workunits/rbd/qemu-iotests.sh
index 91e62734e6cee..c453743782892 100755
--- a/qa/workunits/rbd/qemu-iotests.sh
+++ b/qa/workunits/rbd/qemu-iotests.sh
@@ -38,7 +38,13 @@ cd "$iotests"
 
 mkdir bin
 # qemu-iotests expects a binary called just 'qemu' to be available
-ln -s `which qemu-system-x86_64` bin/qemu
+if [ -x '/usr/bin/qemu-system-x86_64' ]
+then
+    QEMU='/usr/bin/qemu-system-x86_64'
+else
+    QEMU='/usr/libexec/qemu-kvm'
+fi
+ln -s $QEMU bin/qemu
 
 # this is normally generated by configure, but has nothing but a python
 # binary definition, which we don't care about.  for some reason it is