Commit 48cd3dfa668e5033b02dd029c2e6de558a3c4583 introduced configuration
file for libvirt-admin but forgot to distribute it. Also the change
made to libvirt.conf in commit dbecb87f94e8f1591e3c471b34ae48a7203c9cb3
should've been removed thanks to introduction of separate config file.
Signed-off-by: Martin Kletzander <mkletzan@xxxxxxxxxx>
---
libvirt.spec.in | 1 +
src/Makefile.am | 2 +-
src/libvirt.conf | 1 -
3 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libvirt.spec.in b/libvirt.spec.in
index bbd287b4d570..1f76f2406c5d 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -1569,6 +1569,7 @@ mv $RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/*/libvirt.so \
rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt-admin.so
rm -f $RPM_BUILD_ROOT%{_bindir}/virt-admin
rm -f $RPM_BUILD_ROOT%{_mandir}/man1/virt-admin.1*
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/libvirt-admin.conf
%if %{with_network}
install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/lib/libvirt/dnsmasq/
diff --git a/src/Makefile.am b/src/Makefile.am
index be3b3c84e863..7219f7c5635a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -79,7 +79,7 @@ moddir = $(libdir)/libvirt/connection-driver
mod_LTLIBRARIES =
confdir = $(sysconfdir)/libvirt
-conf_DATA = libvirt.conf
+conf_DATA = libvirt.conf libvirt-admin.conf
augeasdir = $(datadir)/augeas/lenses
augeas_DATA =
diff --git a/src/libvirt.conf b/src/libvirt.conf
index a6e16ae1534c..da4dfbecb187 100644
--- a/src/libvirt.conf
+++ b/src/libvirt.conf
@@ -16,4 +16,3 @@
# (@uri_default also prevents probing of the hypervisor driver).
#
#uri_default = "qemu:///system"
-#uri_default_admin = "libvirtd:///system"
--
2.6.3
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list