Makefile: xend-install .. deal with OVS 3.4.x

If building Xen 4.4.4 from OVS 3.4.x, there are couple of
extra pieces added - such as SSL and an OCFS dlm manager.

We don't need this in XTT so lets rewrite the xend.config
to bypass them.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

diff --git a/root_image/Makefile b/root_image/Makefile
index cc08c41b3e0669dbc06c4e097693dc7cf5e325a9..afb377e0b85d8748542323d5af2b4f36cde7adfc 100644 (file)
--- a/root_image/Makefile
+++ b/root_image/Makefile
@@ -971,7 +971,11 @@ endif
        if [ -e userspace/etc/xen/xend-config.sxp ]; then \
                sed -i 's/\(^[[:blank:]]*(network-script network-bridge)\)/# \1/' userspace/etc/xen/xend-config.sxp; \
                sed -i 's/\(^[[:blank:]]*(xend-relocation-hosts-allow.*\)/# \1/' userspace/etc/xen/xend-config.sxp; \
+               sed -i 's/\(^[[:blank:]]*(xend-relocation-ssl-server.*\)/# \1/' userspace/etc/xen/xend-config.sxp; \
+               sed -i 's/\(^[[:blank:]]*(xend-domains-lock-path.*\)/# \1/' userspace/etc/xen/xend-config.sxp; \
+               sed -i 's/\(^[[:blank:]]*(xend-relocation-server-ssl.*\)/# \1/' userspace/etc/xen/xend-config.sxp; \
                echo "(xend-relocation-hosts-allow '')" >> userspace/etc/xen/xend-config.sxp; \
+               echo "(loglevel DEBUG)" >> userspace/etc/xen/xend-config.sxp; \
        else \
                echo "(logfile /var/log/xen/xend.log)" >> userspace/etc/xen/xend-config.sxp; \
                echo "(loglevel DEBUG)" >> userspace/etc/xen/xend-config.sxp; \