Hello,

I have attached a debdiff that should fix #767028 and #774437. It does so by using invoke-rc.d to reload the udev rules, and checking that the necessary filesystems are mounted before using the trigger and settle. It also eliminates the hard coded uid/gid values.

Please take a look, László.

Thank you,
--
Cameron Norman
diff -Nru ovirt-guest-agent-1.0.10.2.dfsg/debian/changelog ovirt-guest-agent-1.0.10.2.dfsg/debian/changelog
--- ovirt-guest-agent-1.0.10.2.dfsg/debian/changelog	2014-10-20 12:00:09.000000000 -0700
+++ ovirt-guest-agent-1.0.10.2.dfsg/debian/changelog	2015-02-13 17:43:40.000000000 -0800
@@ -1,3 +1,11 @@
+ovirt-guest-agent (1.0.10.2.dfsg-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Do not hardcode UID/GID values (closes: #774437).
+  * Do not use udevadm in chroot (closes: #767028).
+
+ -- Cameron Norman <[email protected]>  Fri, 13 Feb 2015 17:39:51 -0800
+
 ovirt-guest-agent (1.0.10.2.dfsg-1) unstable; urgency=low
 
   * New upstream release.
diff -Nru ovirt-guest-agent-1.0.10.2.dfsg/debian/postinst ovirt-guest-agent-1.0.10.2.dfsg/debian/postinst
--- ovirt-guest-agent-1.0.10.2.dfsg/debian/postinst	2014-08-10 09:49:46.000000000 -0700
+++ ovirt-guest-agent-1.0.10.2.dfsg/debian/postinst	2015-02-13 18:44:39.000000000 -0800
@@ -1,8 +1,15 @@
 #!/bin/sh
 set -e
 
-udevadm control --reload-rules
-udevadm trigger --subsystem-match="virtio-ports" --attr-match="name=com.redhat.rhevm.vdsm"
-udevadm settle
+if test -x /usr/sbin/invoke-rc.d ; then
+	invoke-rc.d udev reload >/dev/null 2>&1 || true
+fi
+
+if test -d /sys/class && \
+   test -e /proc/filesystems && \
+   ! ischroot; then
+	udevadm trigger --subsystem-match="virtio-ports" --attr-match="name=com.redhat.rhevm.vdsm"
+	udevadm settle
+fi
 
 #DEBHELPER#
diff -Nru ovirt-guest-agent-1.0.10.2.dfsg/debian/preinst ovirt-guest-agent-1.0.10.2.dfsg/debian/preinst
--- ovirt-guest-agent-1.0.10.2.dfsg/debian/preinst	2014-08-10 09:50:12.000000000 -0700
+++ ovirt-guest-agent-1.0.10.2.dfsg/debian/preinst	2015-02-13 17:55:45.000000000 -0800
@@ -2,7 +2,7 @@
 set -e
 
 
-getent group ovirtagent >/dev/null || groupadd -r -g 175 ovirtagent
-getent passwd ovirtagent > /dev/null || useradd -u 175 -g 175 -o -r ovirtagent -c "oVirt Guest Agent" -d /usr/share/ovirt-guest-agent -s /sbin/nologin
+getent group ovirtagent >/dev/null || groupadd -r ovirtagent
+getent passwd ovirtagent > /dev/null || useradd -r ovirtagent -g ovirtagent -c "oVirt Guest Agent" -d /usr/share/ovirt-guest-agent -s /sbin/nologin
 
 #DEBHELPER#

Reply via email to