From ddd421f87c09593e8cefeabb65349303988bdf87 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Mon, 12 Oct 2015 10:51:27 +0200 Subject: [PATCH] * Now checking for libvirt or libvirtd group existance before guessing it with "dpkg-vendor --derives-from ubuntu". Rewritten-From: 52857593e75479c25bc05b66ad7e397bd0238aca --- trusty/debian/ceilometer-common.postinst.in | 12 +++++++++--- trusty/debian/changelog | 7 +++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/trusty/debian/ceilometer-common.postinst.in b/trusty/debian/ceilometer-common.postinst.in index 2e84d15..346f2c6 100644 --- a/trusty/debian/ceilometer-common.postinst.in +++ b/trusty/debian/ceilometer-common.postinst.in @@ -6,10 +6,16 @@ set -e # We need to do that for ceilometer-agent-compute libvirt_user_group () { - if dpkg-vendor --derives-from ubuntu ; then - LIBVIRT_GROUP=libvirtd - else + if getent group libvirt ; then LIBVIRT_GROUP=libvirt + elif getent group libvirtd ; then + LIBVIRT_GROUP=libvirtd + elif + if dpkg-vendor --derives-from ubuntu ; then + LIBVIRT_GROUP=libvirtd + else + LIBVIRT_GROUP=libvirt + fi fi if ! getent group ${LIBVIRT_GROUP} >/dev/null; then diff --git a/trusty/debian/changelog b/trusty/debian/changelog index 8a9a146..23fb633 100644 --- a/trusty/debian/changelog +++ b/trusty/debian/changelog @@ -1,3 +1,10 @@ +ceilometer (1:5.0.0~rc1-2) UNRELEASED; urgency=medium + + * Now checking for libvirt or libvirtd group existance before guessing it + with "dpkg-vendor --derives-from ubuntu". + + -- Thomas Goirand Mon, 12 Oct 2015 10:50:26 +0200 + ceilometer (1:5.0.0~rc1-1) experimental; urgency=medium * New upstream release. -- 2.32.3