From 2c2ca80ce0caadc9efa18c9f9289f6b98b3c486e Mon Sep 17 00:00:00 2001 From: Jan Zerebecki Date: Tue, 17 Oct 2017 18:27:47 +0200 Subject: [PATCH] Fix libvirt daemon name condition This makes the condition that chooses which daemon name libvirt to call the same as for choosing the livirt package names. Without this fix the condition checking for a directory is incorrect when livirt is not yet installed, but is used before installing the packages. Change-Id: Ib5eb12769128527a6f4b3b5f7674bd2dad0ed160 --- lib/nova_plugins/functions-libvirt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/nova_plugins/functions-libvirt b/lib/nova_plugins/functions-libvirt index 8d74c77517..dd299761e4 100644 --- a/lib/nova_plugins/functions-libvirt +++ b/lib/nova_plugins/functions-libvirt @@ -25,7 +25,7 @@ DEBUG_LIBVIRT=$(trueorfalse True DEBUG_LIBVIRT) DEBUG_LIBVIRT_COREDUMPS=$(trueorfalse False DEBUG_LIBVIRT_COREDUMPS) # Only Xenial is left with libvirt-bin. Everywhere else is libvirtd -if is_ubuntu && [ ! -f /etc/init.d/libvirtd ]; then +if is_ubuntu && [ ${DISTRO} == "xenial" ]; then LIBVIRT_DAEMON=libvirt-bin else LIBVIRT_DAEMON=libvirtd