Merge "Debian: use libvirt-bin when needed"

2014-09-19 00:21:42 +00:00
parent a422c85371 a214363cf0
commit 12294d2b19
1 changed files with 3 additions and 1 deletions
--- a/lib/nova_plugins/functions-libvirt
+++ b/lib/nova_plugins/functions-libvirt
@@ -57,7 +57,9 @@ cgroup_device_acl = [
 EOF
    fi

-    if [ "$os_VENDOR" = "Ubuntu" ]; then
+    # Since the release of Debian Wheezy the libvirt init script is libvirtd
+    # and not libvirtd-bin anymore.
+    if is_ubuntu && [ ! -f /etc/init.d/libvirtd ]; then
        LIBVIRT_DAEMON=libvirt-bin
    else
        LIBVIRT_DAEMON=libvirtd