* 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 2e84d15748c69757d9c164820c4a9fd96f63975d..346f2c626732c41d5cbd226ca06c62d17a724330 100644 (file)
--- 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 8a9a14652dc9d5ff54bd42dbd8c5077ef634343f..23fb633dfe6f2757b2b7797c1f7ebad8a36fea17 100644 (file)
--- 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.