Don't listen on the admin socket in the daemon and comment out the
admin devel files out of specfile.
Library is still being compiled and installed in order to link easily
without any disturbing modifications to the daemon code.
Signed-off-by: Martin Kletzander <mkletzan@xxxxxxxxxx>
---
Makefile.am | 2 +-
daemon/libvirtd.c | 3 ++-
docs/Makefile.am | 5 ++---
include/libvirt/Makefile.am | 5 +++--
libvirt.spec.in | 7 +++----
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 9796069c8da0..91b943bea019 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -50,7 +50,7 @@ EXTRA_DIST = \
$(XML_EXAMPLES)
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libvirt.pc libvirt-qemu.pc libvirt-lxc.pc libvirt-admin.pc
+pkgconfig_DATA = libvirt.pc libvirt-qemu.pc libvirt-lxc.pc
NEWS: $(top_srcdir)/docs/news.xsl $(top_srcdir)/docs/news.html.in
$(AM_V_GEN)if [ -x $(XSLTPROC) ] ; then \
diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c
index 20e0b2f07f36..654e7f4797a0 100644
--- a/daemon/libvirtd.c
+++ b/daemon/libvirtd.c
@@ -522,7 +522,8 @@ daemonSetupNetworking(virNetServerPtr srv,
virNetServerAddService(srv, svcRO, NULL) < 0)
goto cleanup;
- if (sock_path_adm) {
+ /* Temporarily disabled */
+ if (sock_path_adm && false) {
VIR_DEBUG("Registering unix socket %s", sock_path_adm);
if (!(svcAdm = virNetServerServiceNewUNIX(sock_path_adm,
unix_sock_adm_mask,
diff --git a/docs/Makefile.am b/docs/Makefile.am
index e8d45bfbf24d..daf37b6b95de 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -136,8 +136,7 @@ apidir = $(pkgdatadir)/api
api_DATA = \
libvirt-api.xml \
libvirt-qemu-api.xml \
- libvirt-lxc-api.xml \
- libvirt-admin-api.xml
+ libvirt-lxc-api.xml
fig = \
libvirt-net-logical.fig \
@@ -157,7 +156,7 @@ EXTRA_DIST= \
hacking1.xsl hacking2.xsl wrapstring.xsl \
$(dot_html) $(dot_html_in) $(gif) $(apihtml) $(apipng) \
$(devhelphtml) $(devhelppng) $(devhelpcss) $(devhelpxsl) \
- $(xml) $(qemu_xml) $(lxc_xml) $(admin_xml) $(fig) $(png) $(css) \
+ $(xml) $(qemu_xml) $(lxc_xml) $(fig) $(png) $(css) \
$(patches) $(dot_php_in) $(dot_php_code_in) $(dot_php)\
$(internals_html_in) $(internals_html) \
sitemap.html.in aclperms.htmlinc \
diff --git a/include/libvirt/Makefile.am b/include/libvirt/Makefile.am
index 2b64b0db2a3b..2d40621116b1 100644
--- a/include/libvirt/Makefile.am
+++ b/include/libvirt/Makefile.am
@@ -34,9 +34,10 @@ virinc_HEADERS = libvirt.h \
libvirt-qemu.h \
virterror.h
-virinc_HEADERS += libvirt-admin.h
-
install-exec-hook:
$(mkinstalldirs) $(DESTDIR)$(virincdir)
EXTRA_DIST = libvirt.h.in
+
+# Temporarily disabled, but we need it for building
+EXTRA_DIST += libvirt-admin.h
diff --git a/libvirt.spec.in b/libvirt.spec.in
index e1a15f4300ab..7132f733a8ab 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -1560,6 +1560,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt/connection-driver/*.a
rm -f $RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/*/libvirt.la
%endif
+# Temporarily get rid of not-installed libvirt-admin.so
+rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt-admin.so
+
%if %{with_network}
install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/lib/libvirt/dnsmasq/
# We don't want to install /etc/libvirt/qemu/networks in the main %files list
@@ -2287,7 +2290,6 @@ exit 0
%{_libdir}/libvirt.so
%{_libdir}/libvirt-qemu.so
%{_libdir}/libvirt-lxc.so
-%{_libdir}/libvirt-admin.so
%dir %{_includedir}/libvirt
%{_includedir}/libvirt/virterror.h
%{_includedir}/libvirt/libvirt.h
@@ -2304,17 +2306,14 @@ exit 0
%{_includedir}/libvirt/libvirt-stream.h
%{_includedir}/libvirt/libvirt-qemu.h
%{_includedir}/libvirt/libvirt-lxc.h
-%{_includedir}/libvirt/libvirt-admin.h
%{_libdir}/pkgconfig/libvirt.pc
%{_libdir}/pkgconfig/libvirt-qemu.pc
%{_libdir}/pkgconfig/libvirt-lxc.pc
-%{_libdir}/pkgconfig/libvirt-admin.pc
%dir %{_datadir}/libvirt/api/
%{_datadir}/libvirt/api/libvirt-api.xml
%{_datadir}/libvirt/api/libvirt-qemu-api.xml
%{_datadir}/libvirt/api/libvirt-lxc-api.xml
-%{_datadir}/libvirt/api/libvirt-admin-api.xml
%doc docs/*.html docs/html docs/*.gif
--
2.4.4
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list