From 93e164d97317bb4ca56bc734d95764777c838e68 Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Fri, 27 Mar 2015 13:38:10 -0700 Subject: [PATCH] Test for presence of /dev/kvm before setting permissions In a native QEMU environment there is no /dev/kvm. Change-Id: I4d0eb32fd6fad3a4c9c15c7c2b12430b2e4db154 --- docker/nova-compute/nova-libvirt/start.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/docker/nova-compute/nova-libvirt/start.sh b/docker/nova-compute/nova-libvirt/start.sh index d92f52ab0e..8d45070b5e 100755 --- a/docker/nova-compute/nova-libvirt/start.sh +++ b/docker/nova-compute/nova-libvirt/start.sh @@ -1,8 +1,11 @@ #!/bin/sh # If libvirt is not installed on the host permissions need to be set -chmod 660 /dev/kvm -chown root:kvm /dev/kvm +# If running in qemu, we don't need to set anything as /dev/kvm won't exist +if [[ -c /dev/kvm ]]; then + chmod 660 /dev/kvm + chown root:kvm /dev/kvm +fi echo "Starting libvirtd." exec /usr/sbin/libvirtd