From a214363cf0420ab62c26925a4bfef856643a1957 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gon=C3=A9ri=20Le=20Bouder?= Date: Wed, 17 Sep 2014 11:55:31 +0200 Subject: [PATCH] Debian: use libvirt-bin when needed libvirtd is the new name of the init script in Debian testing. libvirt-bin is still in use on Debian Wheezy. Since I222b71962f49896063910ff2a25e4f57be4bf819, libvirtd is the default for Debian, this break the compatibility with Debian Wheezy. With this patch, we use libvirt-bin only if there is no /etc/init.d/libvirtd init script. Change-Id: I13694fef93d36c2e128e15e7dbfaec9230335585 --- lib/nova_plugins/functions-libvirt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/nova_plugins/functions-libvirt b/lib/nova_plugins/functions-libvirt index f722836693..6b9db48de8 100644 --- 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