commit 12294d2b199aaae40763943944f28acf2335ffee
author Jenkins <jenkins@review.openstack.org> Fri Sep 19 00:21:42 2014 +0000
committer Gerrit Code Review <review@openstack.org> Fri Sep 19 00:21:42 2014 +0000
tree 751e74c70adaa615f84a63097ce9cb60413c0ba8
parent a422c85371aa320eb52a0d09b6964adbc083db01
parent a214363cf0420ab62c26925a4bfef856643a1957

Merge "Debian: use libvirt-bin when needed"

lib/nova_plugins/functions-libvirt

diff --git a/lib/nova_plugins/functions-libvirt b/lib/nova_plugins/functions-libvirt
index f722836..6b9db48 100644
--- a/lib/nova_plugins/functions-libvirt
+++ b/lib/nova_plugins/functions-libvirt
@@ -57,7 +57,9 @@
 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