From: Thomas Goirand <zigo@debian.org>
Date: Mon, 12 Oct 2015 08:51:27 +0000 (+0200)
Subject:   * Now checking for libvirt or libvirtd group existance before guessing it
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=968509950453ae67ec838c86372de2d3fa19d3d2;p=openstack-build%2Fceilometer-build.git

  * Now checking for libvirt or libvirtd group existance before guessing it
    with "dpkg-vendor --derives-from ubuntu".

Rewritten-From: 52857593e75479c25bc05b66ad7e397bd0238aca
---

diff --git a/xenial/debian/ceilometer-common.postinst.in b/xenial/debian/ceilometer-common.postinst.in
index 2e84d15..346f2c6 100644
--- a/xenial/debian/ceilometer-common.postinst.in
+++ b/xenial/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/xenial/debian/changelog b/xenial/debian/changelog
index 8a9a146..23fb633 100644
--- a/xenial/debian/changelog
+++ b/xenial/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 <zigo@debian.org>  Mon, 12 Oct 2015 10:50:26 +0200
+
 ceilometer (1:5.0.0~rc1-1) experimental; urgency=medium
 
   * New upstream release.