Merge ~paride/utah/+git/utah:xenial-fixes into utah:master

[Paride Legovini]

Allow UTAH to run on Xenial again

Changes:
 - utah.postinst: support both the libvirt and libvirtd groups
 - add workaround for lp#1548499

[Michael Hudson-Doyle (mwhudson)]

sure

review: Approve

diff --git a/debian/utah.postinst b/debian/utah.postinst
index c307cc1..8636fb7 100644
--- a/debian/utah.postinst
+++ b/debian/utah.postinst
@@ -56,9 +56,14 @@ EOD
       [ -z "$SERVER_USER" ] && SERVER_USER=utah
       [ -z "$SERVER_NAME" ] && SERVER_NAME="UTAH"
       [ -z "$SERVER_GROUP" ] && SERVER_GROUP=utah
-      [ -z "$SERVER_GROUPS" ] && SERVER_GROUPS="libvirt,kvm"
       [ -z "$SSH_DIR" ] && SSH_DIR=~utah/.ssh
 
+      if [ -z "$SERVER_GROUPS" ]; then
+        SERVER_GROUPS="kvm"
+        getent group libvirtd >/dev/null && SERVER_GROUPS="$SERVER_GROUPS,libvirtd"
+        getent group libvirt >/dev/null && SERVER_GROUPS="$SERVER_GROUPS,libvirt"
+      fi
+
       if ! getent group | grep -q "^$SERVER_GROUP:"
       then
         addgroup --quiet --system $SERVER_GROUP 2>/dev/null || true
diff --git a/utah/provisioning/vm.py b/utah/provisioning/vm.py
index e9fb01e..f543eed 100644
--- a/utah/provisioning/vm.py
+++ b/utah/provisioning/vm.py
@@ -415,7 +415,8 @@ class CustomVM(CustomInstallMixin, SSHMixin, LibvirtVM):
             serial.set('type', 'file')
             source = ElementTree.Element('source')
             source.set('path', self.syslog)
-            source.set('append', 'on')
+            # TODO: reintegrate this when the required qemu version lands
+            # source.set('append', 'on') # lp#1548499
             serial.append(source)
             target = ElementTree.Element('target')
             target.set('port', '0')