Use usermode for properly vdsm console commands (like flush caches on migration).

2 files changed, 20 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a56f8777f549..84010eb1ff75 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Wed Jan 23 08:15:00 UTC 2019
+# Wed Jan 23 09:56:44 UTC 2019
 pkgbase = ovirt-guest-agent
 	pkgdesc = The oVirt Guest Agent
 	pkgver = 1.0.15
-	pkgrel = 1
+	pkgrel = 2
 	url = https://ovirt.org/develop/developer-guide/vdsm/guest-agent
 	install = ovirt-guest-agent.install
 	arch = x86_64
@@ -14,6 +14,13 @@ pkgbase = ovirt-guest-agent
 	makedepends = python2-pycodestyle
 	makedepends = patch
 	makedepends = autoconf
+	depends = qemu-guest-agent
+	depends = python2
+	depends = python2-dbus
+	depends = python2-gobject2
+	depends = dbus-glib
+	depends = python2-ethtool
+	depends = usermode
 	backup = etc/ovirt-guest-agent.conf
 	source = https://github.com/oVirt/ovirt-guest-agent/archive/1.0.15.tar.gz
 	source = python2-arch.patch
@@ -35,22 +42,4 @@ pkgbase = ovirt-guest-agent
 	sha256sums = 45864cbe0576d33962ee57bf4ac0c5f70e67c423278bf291e8ecefe2668ff538
 
 pkgname = ovirt-guest-agent
-	pkgdesc = The oVirt Guest Agent
-	depends = qemu-guest-agent
-	depends = python2-dbus
-	depends = python2-gobject2
-	depends = dbus-glib
-	depends = python2-ethtool
-	conflicts = ovirt-guest-agent-common
-
-pkgname = ovirt-guest-agent-common
-	pkgdesc = The oVirt Guest Agent (with X support)
-	depends = qemu-guest-agent
-	depends = python2
-	depends = python2-dbus
-	depends = python2-gobject2
-	depends = dbus-glib
-	depends = python2-ethtool
-	depends = usermode
-	conflicts = ovirt-guest-agent
 
diff --git a/PKGBUILD b/PKGBUILD
index bcf4f5153769..40c8929195c6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,14 +2,15 @@
 # Contributor: Konstantin Shalygin <k0ste@k0ste.ru>
 
 pkgbase='ovirt-guest-agent'
-pkgname=("${pkgbase}" "${pkgbase}-common")
-_mainver='1.0.15'
-pkgver="${_mainver}"
-pkgrel='1'
+pkgname=("${pkgbase}")
+pkgver="1.0.15"
+pkgrel='2'
 pkgdesc='The oVirt Guest Agent'
 arch=('x86_64')
 url="https://ovirt.org/develop/developer-guide/vdsm/guest-agent"
 makedepends=('pam' 'libtool' 'python2' 'python2-pycodestyle' 'patch' 'autoconf')
+depends=('qemu-guest-agent' 'python2' 'python2-dbus' 'python2-gobject2' 'dbus-glib' 'python2-ethtool' 'usermode')
+pkgdesc='The oVirt Guest Agent'
 license=('ASL 2.0')
 install="${pkgbase}.install"
 source=("https://github.com/oVirt/${pkgbase}/archive/${pkgver}.tar.gz"
@@ -62,11 +63,7 @@ build() {
   make
 }
 
-package_ovirt-guest-agent() {
-  depends=('qemu-guest-agent' 'python2-dbus' 'python2-gobject2' 'dbus-glib' 'python2-ethtool')
-  pkgdesc='The oVirt Guest Agent'
-  conflicts=("${pkgbase}-common")
-
+package() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 
@@ -76,20 +73,10 @@ package_ovirt-guest-agent() {
   install -Dm0644 "${srcdir}/39-ovirt-memory-hotplug.rules" "${pkgdir}/usr/lib/udev/rules.d/39-ovirt-memory-hotplug.rules"
   mv "${pkgdir}/etc/udev/rules.d/"* "${pkgdir}/usr/lib/udev/rules.d/"
   rm -rf "${pkgdir}/etc/udev"
-}
-
-package_ovirt-guest-agent-common() {
-  depends=('qemu-guest-agent' 'python2' 'python2-dbus' 'python2-gobject2' 'dbus-glib' 'python2-ethtool' 'usermode')
-  pkgdesc='The oVirt Guest Agent (with X support)'
-  conflicts=("${pkgbase}")
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
 
-  install -Dm0644 "${srcdir}/${pkgbase}.service" "${pkgdir}/usr/lib/systemd/system/${pkgbase}.service"
-  install -Dm0644 "${srcdir}/${pkgbase}.sysusers" "${pkgdir}/usr/lib/sysusers.d/${pkgbase}.conf"
-  install -Dm0644 "${srcdir}/${pkgbase}.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/${pkgbase}.conf"
-  install -Dm0644 "${srcdir}/39-ovirt-memory-hotplug.rules" "${pkgdir}/usr/lib/udev/rules.d/39-ovirt-memory-hotplug.rules"
-  mv "${pkgdir}/etc/udev/rules.d/"* "${pkgdir}/usr/lib/udev/rules.d/"
-  rm -rf "${pkgdir}/etc/udev"
+# EL7 Magic
+  cp "${srcdir}/console.apps_diskmapper" "${pkgdir}/etc/security/console.apps/diskmapper"
+  cp "${srcdir}/pam.d_diskmapper" "${pkgdir}/etc/pam.d/diskmapper"
+  mv "${pkgdir}/usr/share/${pkgbase}/diskmapper" "${pkgdir}/usr/share/${pkgbase}/diskmapper.script"
+  ln -s "/usr/bin/consolehelper" "${pkgdir}/usr/share/${pkgbase}/diskmapper"
 }