[node-patches] Change in ovirt-node[ovirt-3.5]: recipe: Copy the libvirtd upstart into place for vdsm

[fabiand at redhat.com]

Fabian Deutsch has uploaded a new change for review.

Change subject: recipe: Copy the libvirtd upstart into place for vdsm
......................................................................

recipe: Copy the libvirtd upstart into place for vdsm

We can not whitelist the libvirtd.upstart file in /usr/share/doc because we
don't install doc files (--excludedocs is used in the %packages sections).
The approach is now to bundle the file and copy it into the place where
vdsm expects it at build time.

In addition we still need the whitelisting in the minimizer part, because
otherwise the minimizer would remove it again.

Change-Id: I2e3575c5146cc75b72e47ab9ef85882a256ea545
Bug-Url:https://bugzilla.redhat.com/show_bug.cgi?id=1235350
Signed-off-by: Fabian Deutsch <fabiand at fedoraproject.org>
---
M recipe/rhevh6-post.ks
1 file changed, 6 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/62/43162/1

diff --git a/recipe/rhevh6-post.ks b/recipe/rhevh6-post.ks
index 1b69fed..b0c02a1 100644
--- a/recipe/rhevh6-post.ks
+++ b/recipe/rhevh6-post.ks
@@ -26,7 +26,12 @@
 
 echo "Installing libvirtd.upstart file"
 # https://bugzilla.redhat.com/show_bug.cgi?id=1233059
-cp -v /usr/share/doc/libvirt-*/libvirtd.upstart /etc/init/libvirtd.conf
+# We install the file to /etc/init - now we need to copy it into
+# place for vdsm. vdsm retrieves the upstart path by querying rpm
+LIBVIRT_UPSTART=$(rpm -ql libvirt | grep upstart)
+echo "Using ${LIBVIRT_UPSTART}"
+mkdir -vp $(dirname ${LIBVIRT_UPSTART})
+cp -v /etc/init/libvirtd.conf ${LIBVIRT_UPSTART}
 
 echo "Configuring IPTables"
 # here, we need to punch the appropriate holes in the firewall


-- 
To view, visit https://gerrit.ovirt.org/43162
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2e3575c5146cc75b72e47ab9ef85882a256ea545
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: ovirt-3.5
Gerrit-Owner: Fabian Deutsch <fabiand at redhat.com>
Gerrit-Reviewer: Fabian Deutsch <fabiand at redhat.com>