openstack/devstack
Code Issues Proposed changes

Debian: use libvirt-bin when needed

Browse Source 
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
This commit is contained in:
Gonéri Le Bouder 2014-09-17 11:55:31 +02:00 committed by Chmouel Boudjnah
parent 5278b8a0ec
commit a214363cf0
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/nova_plugins/functions-libvirt
View File

@ -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