might even run without kvm

diff --git a/.travis.yml b/.travis.yml
index 16f9a51177c96898254be2037b1560486d04559d..a71d9be2b34d43450c082988c3681a0753f9a429 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,12 @@
+language: generic

 sudo: required
 sudo: required

-

 services:
   - docker
 services:
   - docker

-

 env:
   matrix:
     - IMAGE=latest
     - IMAGE=rawhide
 env:
   matrix:
     - IMAGE=latest
     - IMAGE=rawhide

-    

 before_script:
 - docker pull fedora:$IMAGE
 before_script:
 - docker pull fedora:$IMAGE

-

 script:
 - docker run --privileged -it -v $(pwd)/:/dracut fedora:$IMAGE /dracut/fedora-test.sh $IMAGE-$$
 script:
 - docker run --privileged -it -v $(pwd)/:/dracut fedora:$IMAGE /dracut/fedora-test.sh $IMAGE-$$

diff --git a/test/run-qemu b/test/run-qemu
index a4e15548ca011c5e5f1c0043c91400ddd7c545df..c28de2db4447d5bf03d336c1e7f34643685c20c8 100755 (executable)
--- a/test/run-qemu
+++ b/test/run-qemu
@@ -8,6 +8,7 @@ $(lsmod | grep -q '^kqemu ') && BIN=/usr/bin/qemu && ARGS="-kernel-kqemu "
 [[ -c /dev/kvm && -x /usr/bin/kvm ]] && BIN=/usr/bin/kvm && ARGS=""
 [[ -c /dev/kvm && -x /usr/bin/qemu-kvm ]] && BIN=/usr/bin/qemu-kvm && ARGS=""
 [[ -c /dev/kvm && -x /usr/libexec/qemu-kvm ]] && BIN=/usr/libexec/qemu-kvm && ARGS=""
 [[ -c /dev/kvm && -x /usr/bin/kvm ]] && BIN=/usr/bin/kvm && ARGS=""
 [[ -c /dev/kvm && -x /usr/bin/qemu-kvm ]] && BIN=/usr/bin/qemu-kvm && ARGS=""
 [[ -c /dev/kvm && -x /usr/libexec/qemu-kvm ]] && BIN=/usr/libexec/qemu-kvm && ARGS=""

+[[ -x /usr/bin/qemu-system-$(uname -i) ]] && BIN=/usr/bin/qemu-system-$(uname -i) && ARGS=""

 [[ -c /dev/kvm && -x /usr/bin/qemu-system-$(uname -i) ]] && BIN=/usr/bin/qemu-system-$(uname -i) && ARGS="-enable-kvm"
 
 [[ $BIN ]] || {
 [[ -c /dev/kvm && -x /usr/bin/qemu-system-$(uname -i) ]] && BIN=/usr/bin/qemu-system-$(uname -i) && ARGS="-enable-kvm"
 
 [[ $BIN ]] || {