diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-03-31 00:18:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-03-31 00:18:37 +0000 |
| commit | 309d363d458028b5fee650df54bd2d9c34052a41 (patch) | |
| tree | 858144debb8dc320058b1b2ead8060a7f5740d8b /docker | |
| parent | 045bb325bf3ec30f052f88c63d99dc81dec3cebd (diff) | |
| parent | 93e164d97317bb4ca56bc734d95764777c838e68 (diff) | |
| download | kolla-309d363d458028b5fee650df54bd2d9c34052a41.tar.gz kolla-309d363d458028b5fee650df54bd2d9c34052a41.zip | |
Merge "Test for presence of /dev/kvm before setting permissions"
Diffstat (limited to 'docker')
| -rwxr-xr-x | docker/nova-compute/nova-libvirt/start.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/docker/nova-compute/nova-libvirt/start.sh b/docker/nova-compute/nova-libvirt/start.sh index d92f52ab0..8d45070b5 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 |